From 43c11e80a2961b5c66bde6fc3b13d590eaf0c5d6 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 7 Feb 2025 19:20:31 +0100 Subject: [PATCH 01/92] {linux, linux-headers}: bump 5.{4, 10, 15}.x / 6.{1, 6, 12}.x series 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 63e64c5d65..1e6842c44e 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -137,7 +137,7 @@ config BR2_LINUX_KERNEL_CUSTOM_REPO_GIT_SUBMODULES config BR2_LINUX_KERNEL_VERSION string - default "6.12.11" if BR2_LINUX_KERNEL_LATEST_VERSION + default "6.12.12" 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 50c2ecf5ab..ebd39c2bc7 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 475172fdbd87a153f123a57952672e773bdb6daf5b58a417d1a5e419fcfeec49 linux-6.12.11.tar.xz -sha256 f15e2b1a8bab0eba494b07858a5abc88d8f788e25f6fe4a572a77840bbd5494d linux-6.6.74.tar.xz -sha256 18b0d41d1a7fbad56045cde0d7fc176bfb18361d29c9f07e57109bbf21bf7876 linux-6.1.127.tar.xz +sha256 e98942d17ef7063b3f2d6d7692bf24899e2e021cf832d19b55308ec8e8e08eff linux-6.12.12.tar.xz +sha256 f7dfb1fa9716ba139d0b4c8161535816d400dea21d5943f513448429b1790290 linux-6.6.75.tar.xz +sha256 874d67d3181570e69ac6b33853f0448f05fc90d4cf3e4baaadc4a9cede7c50f3 linux-6.1.128.tar.xz # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256 ea9eb8088d4231f8a01b191ceef5f4d92238f6c7519f6fbcb57e448ee9e0a6e0 linux-5.15.177.tar.xz -sha256 239e57280f8c9159187e383d7b730d29f5cc8e1b30be218f004e0c90d1137f52 linux-5.10.233.tar.xz -sha256 1e3e5fc052c8e15f8eaa37d30bf4f0b3eef7430dd234d9fed0d0005852a06d10 linux-5.4.289.tar.xz +sha256 efe9f7eb5ea4d26cec6290689343e1804eb3b4a88ff5a60497a696fc08157c42 linux-5.15.178.tar.xz +sha256 9597c4fee2f1ce452acfec516f4325ad342155872052fd5f0d9ce2ddcc26ebe5 linux-5.10.234.tar.xz +sha256 6cc73cf2a7f50580f7d8c7e99d2f2e8ada8b7d2f4e76f5896f0daf691cc2a456 linux-5.4.290.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 9a0db19b29..a0cb484bd0 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -428,12 +428,12 @@ endchoice config BR2_DEFAULT_KERNEL_HEADERS string - default "5.4.289" if BR2_KERNEL_HEADERS_5_4 - default "5.10.233" if BR2_KERNEL_HEADERS_5_10 - default "5.15.177" if BR2_KERNEL_HEADERS_5_15 - default "6.1.127" if BR2_KERNEL_HEADERS_6_1 - default "6.6.74" if BR2_KERNEL_HEADERS_6_6 - default "6.12.11" if BR2_KERNEL_HEADERS_6_12 + default "5.4.290" if BR2_KERNEL_HEADERS_5_4 + default "5.10.234" if BR2_KERNEL_HEADERS_5_10 + default "5.15.178" if BR2_KERNEL_HEADERS_5_15 + default "6.1.128" if BR2_KERNEL_HEADERS_6_1 + default "6.6.75" if BR2_KERNEL_HEADERS_6_6 + default "6.12.12" if BR2_KERNEL_HEADERS_6_12 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 3fb7ff3dc6c252c4f82f3c65c43c2b89469e8843 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 7 Feb 2025 19:20:53 +0100 Subject: [PATCH 02/92] package/tor: bump version to 0.4.8.14 Release notes: https://gitlab.torproject.org/tpo/core/tor/-/raw/release-0.4.8/ReleaseNotes https://forum.torproject.org/t/stable-release-0-4-8-14/17242 Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/tor/tor.hash | 4 ++-- package/tor/tor.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/tor/tor.hash b/package/tor/tor.hash index eb0ab728d2..def488d516 100644 --- a/package/tor/tor.hash +++ b/package/tor/tor.hash @@ -1,4 +1,4 @@ -# From https://dist.torproject.org/tor-0.4.8.13.tar.gz.sha256sum -sha256 9baf26c387a2820b3942da572146e6eb77c2bc66862af6297cd02a074e6fba28 tor-0.4.8.13.tar.gz +# From https://dist.torproject.org/tor-0.4.8.14.tar.gz.sha256sum +sha256 5047e1ded12d9aac4eb858f7634a627714dd58ce99053d517691a4b304a66d10 tor-0.4.8.14.tar.gz # Locally computed sha256 47b54ed17e8fdcab3c44729a1789a09b208f9a63a845a7e50def9df729eebad0 LICENSE diff --git a/package/tor/tor.mk b/package/tor/tor.mk index 042ed75a7b..f4e1efb051 100644 --- a/package/tor/tor.mk +++ b/package/tor/tor.mk @@ -4,7 +4,7 @@ # ################################################################################ -TOR_VERSION = 0.4.8.13 +TOR_VERSION = 0.4.8.14 TOR_SITE = https://dist.torproject.org TOR_LICENSE = BSD-3-Clause TOR_LICENSE_FILES = LICENSE From 2da031c2e54cb19efae41fb666064551cfccb59e Mon Sep 17 00:00:00 2001 From: Akhilesh Nema Date: Thu, 6 Feb 2025 11:16:13 -0800 Subject: [PATCH 03/92] package/libcurl: security bump to version 8.12.0 Changelog: https://curl.se/ch/8.12.0.html Fixes the following security issues: - CVE-2025-0167: netrc and default credential leak. https://curl.se/docs/CVE-2025-0167.html - CVE-2025-0665: eventfd double close. https://curl.se/docs/CVE-2025-0665.html - CVE-2025-0725: gzip integer overflow. https://curl.se/docs/CVE-2025-0725.html Drop upstream patch - 0001-curl_trc-fix-build-with-verbose-messages-disabled.patch see https://github.com/curl/curl/commit/80257779179ce994b647daca60d7b1c4980b130b Updated hash of the COPYING file (copyright year bump) Signed-off-by: Akhilesh Nema Signed-off-by: Peter Korsgaard --- ...build-with-verbose-messages-disabled.patch | 44 ------------------- package/libcurl/libcurl.hash | 6 +-- package/libcurl/libcurl.mk | 2 +- 3 files changed, 4 insertions(+), 48 deletions(-) delete mode 100644 package/libcurl/0001-curl_trc-fix-build-with-verbose-messages-disabled.patch diff --git a/package/libcurl/0001-curl_trc-fix-build-with-verbose-messages-disabled.patch b/package/libcurl/0001-curl_trc-fix-build-with-verbose-messages-disabled.patch deleted file mode 100644 index ffa44b87b6..0000000000 --- a/package/libcurl/0001-curl_trc-fix-build-with-verbose-messages-disabled.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 58d490091d097ba2ad108cc66c97e242e5aacb9c Mon Sep 17 00:00:00 2001 -Message-ID: <58d490091d097ba2ad108cc66c97e242e5aacb9c.1727153835.git.baruch@tkos.co.il> -From: Baruch Siach -Date: Tue, 24 Sep 2024 07:52:13 +0300 -Subject: [PATCH] curl_trc: fix build with verbose messages disabled - -Add empty definition of Curl_trc_ws() to fix this following build error: - -In file included from sendf.h:29, - from ws.c:35: -ws.c: In function 'Curl_ws_accept': -curl_trc.h:100:10: error: implicit declaration of function 'Curl_trc_ws'; did you mean 'Curl_trc_ftp'? [-Wimplicit-function-declaration] - 100 | Curl_trc_ws(data, __VA_ARGS__); } while(0) - | ^~~~~~~~~~~ -ws.c:779:5: note: in expansion of macro 'CURL_TRC_WS' - 779 | CURL_TRC_WS(data, "WS, using chunk size %zu", chunk_size); - | ^~~~~~~~~~~ - -Signed-off-by: Baruch Siach -Upstream: https://github.com/curl/curl/pull/15026 ---- - lib/curl_trc.h | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/lib/curl_trc.h b/lib/curl_trc.h -index 5f675b453fd3..1801d33cea7c 100644 ---- a/lib/curl_trc.h -+++ b/lib/curl_trc.h -@@ -226,6 +226,12 @@ static void Curl_trc_smtp(struct Curl_easy *data, const char *fmt, ...) - (void)data; (void)fmt; - } - #endif -+#if defined(USE_WEBSOCKETS) && !defined(CURL_DISABLE_HTTP) -+static void Curl_trc_ws(struct Curl_easy *data, const char *fmt, ...) -+{ -+ (void)data; (void)fmt; -+} -+#endif - - #endif /* !defined(CURL_DISABLE_VERBOSE_STRINGS) */ - --- -2.45.2 - diff --git a/package/libcurl/libcurl.hash b/package/libcurl/libcurl.hash index c2ddee2cc2..a79635ed21 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.11.1.tar.xz.asc +# https://curl.se/download/curl-8.12.0.tar.xz.asc # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 -sha256 c7ca7db48b0909743eaef34250da02c19bc61d4f1dcedd6603f109409536ab56 curl-8.11.1.tar.xz -sha256 adb1fc06547fd136244179809f7b7c2d2ae6c4534f160aa513af9b6a12866a32 COPYING +sha256 9a4628c764be6b1a9909567c13e8e771041609df43b2158fcac4e05ea7097e5d curl-8.12.0.tar.xz +sha256 e18f1989333b70044b2adfb7dc2f905d0119dbdcac3bc9f4bc9d540e3a29de5b COPYING diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 845bf43418..56a5761d68 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBCURL_VERSION = 8.11.1 +LIBCURL_VERSION = 8.12.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz LIBCURL_SITE = https://curl.se/download LIBCURL_DEPENDENCIES = host-pkgconf \ From a85c15e31906aca1e1a290808c0539a84e628294 Mon Sep 17 00:00:00 2001 From: Akhilesh Nema Date: Thu, 6 Feb 2025 11:18:25 -0800 Subject: [PATCH 04/92] package/hwdata: bump version to 0.392 Release notes: https://github.com/vcrhonek/hwdata/releases/tag/v0.392 Changelog: https://github.com/vcrhonek/hwdata/compare/v0.391...v0.392 Signed-off-by: Akhilesh Nema Signed-off-by: Peter Korsgaard --- 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 c559c99374..9c8d37323d 100644 --- a/package/hwdata/hwdata.hash +++ b/package/hwdata/hwdata.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 620fe1c22922a3d1bd1062424e9cc6b954acea2f83b72ff0cb45144981cb1975 hwdata-0.391.tar.gz +sha256 1f472d8f2ec824d4efe6a75480767c4ce240fa5d91b6428d9f8775035da3ba1f hwdata-0.392.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 21d0406f93e884a050426ebc21931839a45d56bfcbcbfdda7686d583f36f107f LICENSE diff --git a/package/hwdata/hwdata.mk b/package/hwdata/hwdata.mk index bbf7b861f8..eb9166dc72 100644 --- a/package/hwdata/hwdata.mk +++ b/package/hwdata/hwdata.mk @@ -4,7 +4,7 @@ # ################################################################################ -HWDATA_VERSION = 0.391 +HWDATA_VERSION = 0.392 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 From d9d76e035164b0e781a826999fa293f126134a17 Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Thu, 6 Feb 2025 13:48:24 +0100 Subject: [PATCH 05/92] package/python-waitress: security bump to 3.0.2 Both 3.0.1 and 3.0.2 fix security issues. In 3.0.1: * Fix a bug that would lead to Waitress busy looping on select() on a half-open socket due to a race condition that existed when creating a new HTTPChannel. See https://github.com/Pylons/waitress/pull/435, https://github.com/Pylons/waitress/issues/418 and https://github.com/Pylons/waitress/security/advisories/GHSA-3f84-rpwh-47g6 * With thanks to Dylan Jay and Dieter Maurer for their extensive debugging and helping track this down. * No longer strip the header values before passing them to the WSGI environ. See https://github.com/Pylons/waitress/pull/434 and https://github.com/Pylons/waitress/issues/432 * Fix a race condition in Waitress when channel_request_lookahead is enabled that could lead to HTTP request smuggling. See https://github.com/Pylons/waitress/security/advisories/GHSA-9298-4cf8-g4wj In 3.0.2: * When using Waitress to process trusted proxy headers, Waitress will now update the headers to drop any untrusted values, thereby making sure that WSGI apps only get trusted and validated values that Waitress itself used to update the environ. See https://github.com/Pylons/waitress/pull/452 and https://github.com/Pylons/waitress/issues/451 Full Changelog: https://docs.pylonsproject.org/projects/waitress/en/latest/#change-history Signed-off-by: Marcus Hoffmann Signed-off-by: Peter Korsgaard --- package/python-waitress/python-waitress.hash | 4 ++-- package/python-waitress/python-waitress.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-waitress/python-waitress.hash b/package/python-waitress/python-waitress.hash index c1663a351a..40564457dd 100644 --- a/package/python-waitress/python-waitress.hash +++ b/package/python-waitress/python-waitress.hash @@ -1,5 +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 +md5 da30daf4544fafe0f43e1ba4a1830bf5 waitress-3.0.2.tar.gz +sha256 682aaaf2af0c44ada4abfb70ded36393f0e307f4ab9456a215ce0020baefc31f waitress-3.0.2.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 index c1618817dc..660f839a4d 100644 --- a/package/python-waitress/python-waitress.mk +++ b/package/python-waitress/python-waitress.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WAITRESS_VERSION = 3.0.0 +PYTHON_WAITRESS_VERSION = 3.0.2 PYTHON_WAITRESS_SOURCE = waitress-$(PYTHON_WAITRESS_VERSION).tar.gz -PYTHON_WAITRESS_SITE = https://files.pythonhosted.org/packages/70/34/cb77e5249c433eb177a11ab7425056b32d3b57855377fa1e38b397412859 +PYTHON_WAITRESS_SITE = https://files.pythonhosted.org/packages/bf/cb/04ddb054f45faa306a230769e868c28b8065ea196891f09004ebace5b184 PYTHON_WAITRESS_SETUP_TYPE = setuptools PYTHON_WAITRESS_LICENSE = ZPL-2.1 PYTHON_WAITRESS_LICENSE_FILES = LICENSE.txt From 01e049cea6ee36ae6f89a13d1249cbb482043964 Mon Sep 17 00:00:00 2001 From: Vincent Fazio Date: Fri, 7 Feb 2025 13:23:12 -0600 Subject: [PATCH 06/92] package/python3: bump to version 3.12.9 Brings a number of bugfixes: https://docs.python.org/release/3.12.9/whatsnew/changelog.html#python-3-12-9 Signed-off-by: Vincent Fazio [Julien: update hash file comment URL] Signed-off-by: Julien Olivain --- 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 ea026376fd..34e795b704 100644 --- a/package/python3/python3.hash +++ b/package/python3/python3.hash @@ -1,5 +1,5 @@ -# From https://www.python.org/downloads/release/python-3128/ -md5 d46e5bf9f2e596a3ba45fc0b3c053dd2 Python-3.12.8.tar.xz +# From https://www.python.org/downloads/release/python-3129/ +md5 880942124f7d5c01e7b65cbad62dc873 Python-3.12.9.tar.xz # Locally computed -sha256 c909157bb25ec114e5869124cc2a9c4a4d4c1e957ca4ff553f1edc692101154e Python-3.12.8.tar.xz +sha256 7220835d9f90b37c006e9842a8dff4580aaca4318674f947302b8d28f3f81112 Python-3.12.9.tar.xz sha256 3b2f81fe21d181c499c59a256c8e1968455d6689d269aa85373bfb6af41da3bf LICENSE diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 2be6bb7004..b15c27053f 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).8 +PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).9 PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz PYTHON3_SITE = https://python.org/ftp/python/$(PYTHON3_VERSION) PYTHON3_LICENSE = Python-2.0, others From 9bfa39dca2a9098c244cab5f3cbffa67df2d94f3 Mon Sep 17 00:00:00 2001 From: Akhilesh Nema Date: Thu, 6 Feb 2025 11:17:10 -0800 Subject: [PATCH 07/92] package/ustreamer: bump version to 6.29 Changelog - https://github.com/pikvm/ustreamer/compare/v6.28...v6.29 Signed-off-by: Akhilesh Nema Signed-off-by: Julien Olivain --- package/ustreamer/ustreamer.hash | 2 +- package/ustreamer/ustreamer.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ustreamer/ustreamer.hash b/package/ustreamer/ustreamer.hash index d0f07475fc..02b317bc33 100644 --- a/package/ustreamer/ustreamer.hash +++ b/package/ustreamer/ustreamer.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 7b1f184e72d30e803ca928bc6e31f9e0fbbd17480a2fae78ed2ae10ccc0062a2 ustreamer-6.28.tar.gz +sha256 34572c241f65866caf458fa1526eaf9510656412f34d41a54bcd7aae0ba55630 ustreamer-6.29.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE diff --git a/package/ustreamer/ustreamer.mk b/package/ustreamer/ustreamer.mk index 112b29be8c..107f647f47 100644 --- a/package/ustreamer/ustreamer.mk +++ b/package/ustreamer/ustreamer.mk @@ -4,7 +4,7 @@ # ################################################################################ -USTREAMER_VERSION = 6.28 +USTREAMER_VERSION = 6.29 USTREAMER_SITE = $(call github,pikvm,ustreamer,v$(USTREAMER_VERSION)) USTREAMER_LICENSE = GPL-3.0+ USTREAMER_LICENSE_FILES = LICENSE From 87d4cffa53bf02388d2a0e811196ed9a86c2df59 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 7 Feb 2025 19:19:45 +0100 Subject: [PATCH 08/92] package/intel-mediadriver: bump version to 25.1.1 Signed-off-by: Bernd Kuhls Signed-off-by: Julien Olivain --- 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 5e78e8b404..f3f1e29933 100644 --- a/package/intel-mediadriver/intel-mediadriver.hash +++ b/package/intel-mediadriver/intel-mediadriver.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 94178add6dd545bd14747c063863d87d7b4f3cbcaab5d660d2ae5310cbfe4553 intel-media-25.1.0.tar.gz +sha256 db5788341789099cbfce212f64f428eb79739f578eabfcc6056f03f3029d3708 intel-media-25.1.1.tar.gz sha256 74979d5aaee78b8da82e3aafd415a216b6131dfff6d95d6930927c8a4e3bded3 LICENSE.md diff --git a/package/intel-mediadriver/intel-mediadriver.mk b/package/intel-mediadriver/intel-mediadriver.mk index 41ce987a05..d94d65dd76 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 = 25.1.0 +INTEL_MEDIADRIVER_VERSION = 25.1.1 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 fc9d397fd6344010ee86141b07d5e685a3f9721f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 7 Feb 2025 19:19:46 +0100 Subject: [PATCH 09/92] package/intel-vpl-gpu-rt: bump version to 25.1.1 Signed-off-by: Bernd Kuhls Signed-off-by: Julien Olivain --- package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.hash | 2 +- package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.hash b/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.hash index f75307a552..c3c59d957d 100644 --- a/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.hash +++ b/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 f2f2fba823c885cdd847af646e5639d657e411e0afeff4667b73eb6e524b0dc4 intel-vpl-gpu-rt-25.1.0.tar.gz +sha256 4ba550244827d554c8b36032f1535290c816021242153c2b503dfc45219b95f1 intel-vpl-gpu-rt-25.1.1.tar.gz sha256 c31c3cc5fd66d1250dbca1c3d9011a9f874537442ac71c8de80f2f0fed13f297 LICENSE diff --git a/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.mk b/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.mk index 94c81679c8..ebed6a1081 100644 --- a/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.mk +++ b/package/intel-vpl-gpu-rt/intel-vpl-gpu-rt.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_VPL_GPU_RT_VERSION = 25.1.0 +INTEL_VPL_GPU_RT_VERSION = 25.1.1 INTEL_VPL_GPU_RT_SITE = $(call github,intel,vpl-gpu-rt,intel-onevpl-$(INTEL_VPL_GPU_RT_VERSION)) INTEL_VPL_GPU_RT_LICENSE = MIT INTEL_VPL_GPU_RT_LICENSE_FILES = LICENSE From b28ec6f4313cc805dfb152e06408f1e7137c2ea6 Mon Sep 17 00:00:00 2001 From: Andrea Ricchi Date: Fri, 7 Feb 2025 16:01:49 +0100 Subject: [PATCH 10/92] package/cutekeyboard: bump version to 1.3.0 Signed-off-by: Andrea Ricchi Signed-off-by: Julien Olivain --- package/cutekeyboard/cutekeyboard.hash | 2 +- package/cutekeyboard/cutekeyboard.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/cutekeyboard/cutekeyboard.hash b/package/cutekeyboard/cutekeyboard.hash index 3d3ec2f858..53b438cc1f 100644 --- a/package/cutekeyboard/cutekeyboard.hash +++ b/package/cutekeyboard/cutekeyboard.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 8cbaddc5fbf479d5e20fc88228e9af5928fa5e588052ee496c2f2efbe2afc510 cutekeyboard-afacc3210b75d7e0de27dcc4c0f2bed0212cc4c7.tar.gz +sha256 0f0af01ec99ad07607d2e58c2feee1fba37c9cb7118e8af309fa021f599aec86 cutekeyboard-v1.3.0.tar.gz sha256 bdde6ec2ae2686623c0bb414bfb8bd731b314beff2264c602116ea60dd65964d LICENSE diff --git a/package/cutekeyboard/cutekeyboard.mk b/package/cutekeyboard/cutekeyboard.mk index a7b3ba7a1d..775bed0fe9 100644 --- a/package/cutekeyboard/cutekeyboard.mk +++ b/package/cutekeyboard/cutekeyboard.mk @@ -4,7 +4,7 @@ # ################################################################################ -CUTEKEYBOARD_VERSION = afacc3210b75d7e0de27dcc4c0f2bed0212cc4c7 +CUTEKEYBOARD_VERSION = v1.3.0 CUTEKEYBOARD_SITE = $(call github,amarula,cutekeyboard,$(CUTEKEYBOARD_VERSION)) CUTEKEYBOARD_DEPENDENCIES = qt5declarative qt5quickcontrols2 CUTEKEYBOARD_INSTALL_STAGING = YES From c2f65f3a2b0201be14a740eccb189a503125b080 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?= Date: Fri, 7 Feb 2025 16:48:34 +0100 Subject: [PATCH 11/92] package/nxp-mwifiex: fix build failure on s390x MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit s390x doesn't support Wi-Fi on Linux. See [1]. So let's disable the package for this architecture. Fixes: https://autobuild.buildroot.org/results/44aef9d74857d93d90cefb1d59110e857ff4dfaf [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=f54bfc0e34dbd15e9df099a8e36a346c6c583f3c Signed-off-by: Sébastien Szymanski [Julien: add link to kernel commit hiding wireless for s390] Signed-off-by: Julien Olivain --- package/nxp-mwifiex/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/nxp-mwifiex/Config.in b/package/nxp-mwifiex/Config.in index 7399705b28..7d55a1cc21 100644 --- a/package/nxp-mwifiex/Config.in +++ b/package/nxp-mwifiex/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_NXP_MWIFIEX bool "nxp-mwifiex" + depends on !BR2_s390x depends on BR2_LINUX_KERNEL help Linux kernel driver from NXP for WiFi chipsets From 620d0e86ee16d4438c777661774f637d6c98d3fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?= Date: Fri, 7 Feb 2025 16:48:35 +0100 Subject: [PATCH 12/92] package/nxp-mwifiex: fix build failure due to missing Linux options MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Several drivers for different buses (USB, PCIe, SDIO) are compiled by default. Enable the kernel modules needed by these drivers to prevent build failure: CONFIG_NET CONFIG_WIRELESS CONFIG_CFG80211 CONFIG_USB_SUPPORT CONFIG_USB CONFIG_MMC CONFIG_PCIE Fixes: https://autobuild.buildroot.org/results/c679b793d0b81e7569893a03f95b2e0b8c83e268/ Signed-off-by: Sébastien Szymanski Signed-off-by: Julien Olivain --- package/nxp-mwifiex/nxp-mwifiex.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/nxp-mwifiex/nxp-mwifiex.mk b/package/nxp-mwifiex/nxp-mwifiex.mk index faacaad289..8f085668f1 100644 --- a/package/nxp-mwifiex/nxp-mwifiex.mk +++ b/package/nxp-mwifiex/nxp-mwifiex.mk @@ -11,5 +11,15 @@ NXP_MWIFIEX_LICENSE_FILES = LICENSE NXP_MWIFIEX_MAKE_OPTS = KERNELDIR=$(LINUX_DIR) +define NXP_MWIFIEX_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_NET) + $(call KCONFIG_ENABLE_OPT,CONFIG_WIRELESS) + $(call KCONFIG_ENABLE_OPT,CONFIG_CFG80211) + $(call KCONFIG_ENABLE_OPT,CONFIG_USB_SUPPORT) + $(call KCONFIG_ENABLE_OPT,CONFIG_USB) + $(call KCONFIG_ENABLE_OPT,CONFIG_MMC) + $(call KCONFIG_ENABLE_OPT,CONFIG_PCIE) +endef + $(eval $(kernel-module)) $(eval $(generic-package)) From 707839bbaff6a2993d46161d0aaf5ff5cadd7f88 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 7 Feb 2025 17:02:40 +0100 Subject: [PATCH 13/92] package/kodi-pvr-nextpvr: bump version to 21.3.2-Omega Signed-off-by: Bernd Kuhls Signed-off-by: Julien Olivain --- package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash | 2 +- package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash index e01551fab6..95d487bdab 100644 --- a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash +++ b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 6524671757b58d9eea3c9e7c56896cf7f0a0719236795a6cc3f59278e4d3d7c3 kodi-pvr-nextpvr-21.3.1-Omega.tar.gz +sha256 6315a7bfe038b02c80efe4fe3ee33f92ee2454af8668ce3847e9bcaca38d2147 kodi-pvr-nextpvr-21.3.2-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk index f9e9d4b9cd..56c8830606 100644 --- a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk +++ b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_NEXTPVR_VERSION = 21.3.1-Omega +KODI_PVR_NEXTPVR_VERSION = 21.3.2-Omega KODI_PVR_NEXTPVR_SITE = $(call github,kodi-pvr,pvr.nextpvr,$(KODI_PVR_NEXTPVR_VERSION)) KODI_PVR_NEXTPVR_LICENSE = GPL-2.0+ KODI_PVR_NEXTPVR_LICENSE_FILES = LICENSE.md From 93550cb7712255b1f842b15a8ed668c29ebcc70f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 7 Feb 2025 17:02:41 +0100 Subject: [PATCH 14/92] package/kodi-pvr-waipu: bump version to 21.9.1-Omega Signed-off-by: Bernd Kuhls Signed-off-by: Julien Olivain --- package/kodi-pvr-waipu/kodi-pvr-waipu.hash | 2 +- package/kodi-pvr-waipu/kodi-pvr-waipu.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-waipu/kodi-pvr-waipu.hash b/package/kodi-pvr-waipu/kodi-pvr-waipu.hash index 593bae1cdb..9112fa16f7 100644 --- a/package/kodi-pvr-waipu/kodi-pvr-waipu.hash +++ b/package/kodi-pvr-waipu/kodi-pvr-waipu.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b314155b643eca1936931fe6c010b2f9d50b07a2e0786e8cd8db41ea6f8c1f87 kodi-pvr-waipu-21.9.0-Omega.tar.gz +sha256 9604bf46ef5502306c59d93cd7f9a7ec298e30a17197dd2d8d49300c6ee51a9c kodi-pvr-waipu-21.9.1-Omega.tar.gz sha256 4202d4fb329f58c83ba921b56d7071e37f7df3f15b3820a3a04ef8eee49f54d2 pvr.waipu/LICENSE.txt diff --git a/package/kodi-pvr-waipu/kodi-pvr-waipu.mk b/package/kodi-pvr-waipu/kodi-pvr-waipu.mk index 47bef06966..d830c9d114 100644 --- a/package/kodi-pvr-waipu/kodi-pvr-waipu.mk +++ b/package/kodi-pvr-waipu/kodi-pvr-waipu.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_WAIPU_VERSION = 21.9.0-Omega +KODI_PVR_WAIPU_VERSION = 21.9.1-Omega KODI_PVR_WAIPU_SITE = $(call github,flubshi,pvr.waipu,$(KODI_PVR_WAIPU_VERSION)) KODI_PVR_WAIPU_LICENSE = GPL-2.0+ KODI_PVR_WAIPU_LICENSE_FILES = pvr.waipu/LICENSE.txt From 4bf27608a77143650fa94994363b444d57db7842 Mon Sep 17 00:00:00 2001 From: Thomas Perale Date: Fri, 7 Feb 2025 22:53:41 +0100 Subject: [PATCH 15/92] package/lynis: add wchar dependency Since the introduction of the package lynis in 48bce6ad8f autobuild failure for the gzip package started appearing on configuration without wchar support with the following error message: vasnprintf.c:355:38: warning: implicit declaration of function 'wctomb' [-Wimplicit-function-declaration] 355 | # define local_wcrtomb(S, WC, PS) wctomb ((S), (WC)) | ^~~~~~ This error happens when building gzip without BR2_USE_WCHAR dependency. The gzip package already depends on BR2_USE_WCHAR, this patch also apply this dependency to the lynis package. Fixes: https://autobuild.buildroot.org/results/fbf/fbf31c8c09496cd3fe02e8ed55939dad5c1cbaec https://autobuild.buildroot.org/results/560/56083310acedba31dccc1f6594f814347bf21caf https://autobuild.buildroot.org/results/1d9/1d97e3f0c626421fdae45e794f02c560d1b9080c Signed-off-by: Thomas Perale Signed-off-by: Julien Olivain --- package/lynis/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/lynis/Config.in b/package/lynis/Config.in index 2757e86a2d..e97cb0bf91 100644 --- a/package/lynis/Config.in +++ b/package/lynis/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LYNIS bool "lynis" + depends on BR2_USE_WCHAR # gzip select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS select BR2_PACKAGE_GZIP # runtime (zgrep /proc/config.gz) help From 71b170d098119feb332d0e4ce180d132d482bf17 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 8 Feb 2025 16:39:28 +0100 Subject: [PATCH 16/92] package/busybox: disable CONFIG_FEATURE_IP_LINK_CAN if headers < 4.11 Since the recent bump of Busybox to 1.37.0 in commit ed84e971c36b43f564df881d86ac459bb5b7dad0, the build fails on configurations with old kernel headers. Indeed, the new CONFIG_FEATURE_IP_LINK_CAN Busybox option uses IFLA_CAN_TERMINATION, which was only introduced in Linux 4.11. This commit addresses this issue by disabling CONFIG_FEATURE_IP_LINK_CAN if the headers are not old enough. Fixes: https://gitlab.com/kubu93/buildroot/-/jobs/9059854451 Fixes: ed84e971c36b43f564df881d86ac459bb5b7dad0 ("package/busybox bump version to 1.37.0") Signed-off-by: Thomas Petazzoni Signed-off-by: Julien Olivain --- package/busybox/busybox.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index b7f1439fbc..d3074d2218 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -410,6 +410,13 @@ define BUSYBOX_INSTALL_ADD_TO_SHELLS endef BUSYBOX_TARGET_FINALIZE_HOOKS += BUSYBOX_INSTALL_ADD_TO_SHELLS +ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11),) +# IFLA_CAN_TERMINATION was introduced in Linux 4.11 +define BUSYBOX_DISABLE_IP_LINK_CAN + $(call KCONFIG_DISABLE_OPT,CONFIG_FEATURE_IP_LINK_CAN) +endef +endif + define BUSYBOX_KCONFIG_FIXUP_CMDS $(BUSYBOX_MUSL_DISABLE_SHA_HWACCEL) $(BUSYBOX_SET_MMU) @@ -422,6 +429,7 @@ define BUSYBOX_KCONFIG_FIXUP_CMDS $(BUSYBOX_SET_SELINUX) $(BUSYBOX_SET_LESS_FLAGS) $(BUSYBOX_SET_INDIVIDUAL_BINARIES) + $(BUSYBOX_DISABLE_IP_LINK_CAN) $(PACKAGES_BUSYBOX_CONFIG_FIXUPS) endef From 3d60c1f109fbbc5afab1a079cfdd057460283248 Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Fri, 7 Feb 2025 23:18:14 +0100 Subject: [PATCH 17/92] package/x11r7/xlib_libxshmfence: bump version to 1.3.3 Announcement: https://lists.x.org/archives/xorg-announce/2024-December/003572.html Removed 0001-src-xshmfence_futex.h-fix-build-on-32-bit-architectu.patch, which is accepted upstream. Signed-off-by: Thomas Devoogdt Signed-off-by: Julien Olivain --- ...tex.h-fix-build-on-32-bit-architectu.patch | 46 ------------------- .../xlib_libxshmfence/xlib_libxshmfence.hash | 6 +-- .../xlib_libxshmfence/xlib_libxshmfence.mk | 2 +- 3 files changed, 4 insertions(+), 50 deletions(-) delete mode 100644 package/x11r7/xlib_libxshmfence/0001-src-xshmfence_futex.h-fix-build-on-32-bit-architectu.patch diff --git a/package/x11r7/xlib_libxshmfence/0001-src-xshmfence_futex.h-fix-build-on-32-bit-architectu.patch b/package/x11r7/xlib_libxshmfence/0001-src-xshmfence_futex.h-fix-build-on-32-bit-architectu.patch deleted file mode 100644 index 40a796c4f2..0000000000 --- a/package/x11r7/xlib_libxshmfence/0001-src-xshmfence_futex.h-fix-build-on-32-bit-architectu.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 4fca45a71f08a5bebd12d39c85f49e0b0e4426bf Mon Sep 17 00:00:00 2001 -From: Thomas Devoogdt -Date: Fri, 5 Apr 2024 10:45:15 +0200 -Subject: [PATCH] src/xshmfence_futex.h: fix build on 32-bit architectures - using 64-bit time_t - -Fix the following build failure on 32-bit architectures using 64-bit -time_t (e.g. riscv32): - -xshmfence_futex.h: In function 'sys_futex': -xshmfence_futex.h:58:24: error: 'SYS_futex' undeclared (first use in this function); did you mean 'sys_futex'? - 58 | return syscall(SYS_futex, addr1, op, val1, timeout, addr2, val3); - | ^~~~~~~~~ - | sys_futex - -Similar to: -https://gitlab.freedesktop.org/mesa/mesa/-/commit/7d87478124061915582412ba410759afe863d679 - -Fixes: -https://gitlab.com/buildroot.org/buildroot/-/commit/e39ad96136a8c340b3aea6b036024e28f14584f3 - -Signed-off-by: Thomas Devoogdt -Part-of: -Upstream: https://gitlab.freedesktop.org/xorg/lib/libxshmfence/-/commit/4fca45a71f08a5bebd12d39c85f49e0b0e4426bf ---- - src/xshmfence_futex.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/xshmfence_futex.h b/src/xshmfence_futex.h -index 673ac0e..4476038 100644 ---- a/src/xshmfence_futex.h -+++ b/src/xshmfence_futex.h -@@ -53,6 +53,10 @@ static inline int futex_wait(int32_t *addr, int32_t value) { - #include - #include - -+#if defined(SYS_futex_time64) && !defined(SYS_futex) -+#define SYS_futex SYS_futex_time64 -+#endif -+ - static inline long sys_futex(void *addr1, int op, int val1, struct timespec *timeout, void *addr2, int val3) - { - return syscall(SYS_futex, addr1, op, val1, timeout, addr2, val3); --- -2.34.1 - diff --git a/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.hash b/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.hash index e8f83d427f..a9549ead30 100644 --- a/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.hash +++ b/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.hash @@ -1,5 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2022-December/003287.html -sha256 870df257bc40b126d91b5a8f1da6ca8a524555268c50b59c0acd1a27f361606f libxshmfence-1.3.2.tar.xz -sha512 e20a6827e370726cf50489a69f4a52b897f1c44e3eba8c72a4e626b08724e877d090770b8016765736d887d5d5eaba1fda9c29066e62d259b4d1e2064bc1626c libxshmfence-1.3.2.tar.xz +# From https://lists.x.org/archives/xorg-announce/2024-December/003572.html +sha256 d4a4df096aba96fea02c029ee3a44e11a47eb7f7213c1a729be83e85ec3fde10 libxshmfence-1.3.3.tar.xz +sha512 2261b840ea621cf4ce31961ec9df17aa2e253b268afe289dfb97c240aee27b9f443fe36de5de52a2e1210b69092efde21871e20556bac9b4f1d8a3ead1b4c498 libxshmfence-1.3.3.tar.xz # Locally computed sha256 64a579d1a0b3347301d87c94698a58ea7933d0ae6ca7e8fdd702fde2ea376301 COPYING diff --git a/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk b/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk index 4241102855..b8c9ebfe97 100644 --- a/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk +++ b/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXSHMFENCE_VERSION = 1.3.2 +XLIB_LIBXSHMFENCE_VERSION = 1.3.3 XLIB_LIBXSHMFENCE_SOURCE = libxshmfence-$(XLIB_LIBXSHMFENCE_VERSION).tar.xz XLIB_LIBXSHMFENCE_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXSHMFENCE_LICENSE = MIT From 52162f01299ab5170f9b9c5482c459271f1fd981 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Fri, 7 Feb 2025 22:47:58 +0100 Subject: [PATCH 18/92] package/freetype: bump to 2.13.3 For release note, see: https://sourceforge.net/projects/freetype/files/freetype2/2.13.3/ Signed-off-by: Francois Perrad Signed-off-by: Bernd Kuhls Tested-by: Bernd Kuhls [Julien: add link to release note] Signed-off-by: Julien Olivain --- package/freetype/freetype.hash | 6 +++--- package/freetype/freetype.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/freetype/freetype.hash b/package/freetype/freetype.hash index e7331d5ba0..fcd99319cd 100644 --- a/package/freetype/freetype.hash +++ b/package/freetype/freetype.hash @@ -1,6 +1,6 @@ -# From https://sourceforge.net/projects/freetype/files/freetype2/2.13.2/ -sha1 2d8d5917a1983ebd04921f2993a88858d6f72dec freetype-2.13.2.tar.xz -sha256 12991c4e55c506dd7f9b765933e62fd2be2e06d421505d7950a132e4f1bb484d freetype-2.13.2.tar.xz +# From https://sourceforge.net/projects/freetype/files/freetype2/2.13.3/ +sha1 2437819d11c1205e81141735dcb0a36c0d541e96 freetype-2.13.3.tar.xz +sha256 0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289 freetype-2.13.3.tar.xz # Locally calculated sha256 2e3bbb7d7c5c396368dd0853a790ec29ce5b8647163dde42a0493fb0d6556b2b LICENSE.TXT diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk index 5032414d63..ad8cd00ec8 100644 --- a/package/freetype/freetype.mk +++ b/package/freetype/freetype.mk @@ -4,7 +4,7 @@ # ################################################################################ -FREETYPE_VERSION = 2.13.2 +FREETYPE_VERSION = 2.13.3 FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.xz FREETYPE_SITE = http://download.savannah.gnu.org/releases/freetype FREETYPE_INSTALL_STAGING = YES From 3af192d21b5507994bc2e410499487ae107e87b2 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Wed, 5 Feb 2025 15:42:29 -0800 Subject: [PATCH 19/92] package/docker-compose: bump version to v2.32.4 https://github.com/docker/compose/releases/tag/v2.32.4 Signed-off-by: Christian Stewart Signed-off-by: Julien Olivain --- 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 0fb9767305..e36011e7a9 100644 --- a/package/docker-compose/docker-compose.hash +++ b/package/docker-compose/docker-compose.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 100a1c1522fc58658ce08ed4a6213ffb22f0bf5a728718e6e2b1181a127d321f docker-compose-2.29.7-go2.tar.gz +sha256 481fe93cc6bb76f62b9d2a10c0db67c662d0efad38c3a307b65dd250d8d6599a docker-compose-2.32.4-go2.tar.gz sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd LICENSE diff --git a/package/docker-compose/docker-compose.mk b/package/docker-compose/docker-compose.mk index 26d90d303f..cc98e24133 100644 --- a/package/docker-compose/docker-compose.mk +++ b/package/docker-compose/docker-compose.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOCKER_COMPOSE_VERSION = 2.29.7 +DOCKER_COMPOSE_VERSION = 2.32.4 DOCKER_COMPOSE_SITE = $(call github,docker,compose,v$(DOCKER_COMPOSE_VERSION)) DOCKER_COMPOSE_LICENSE = Apache-2.0 DOCKER_COMPOSE_LICENSE_FILES = LICENSE From a05bed5aace0ed48f75255b34e54288fe4193ffc Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 8 Feb 2025 16:03:30 +0100 Subject: [PATCH 20/92] package/heimdal: host package needs host-libxcrypt The host-heimdal package has always needed a crypt library, but now that libcrypt is no longer part of glibc, we're seeing build failures on machines with recent host glibc versions. To fix this, we add host-libxcrypt to the dependencies, and ensure host-heimdal links with it. Fixes: http://autobuild.buildroot.net/results/864003e1005fcd847b4ec3bd94316638f8f56553/ https://gitlab.com/buildroot.org/buildroot/-/issues/86 Signed-off-by: Thomas Petazzoni Signed-off-by: Julien Olivain --- package/heimdal/heimdal.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/heimdal/heimdal.mk b/package/heimdal/heimdal.mk index 786d94a1aa..155cb66e1f 100644 --- a/package/heimdal/heimdal.mk +++ b/package/heimdal/heimdal.mk @@ -6,7 +6,7 @@ HEIMDAL_VERSION = f4faaeaba371fff3f8d1bc14389f5e6d70ca8e17 HEIMDAL_SITE = $(call github,heimdal,heimdal,$(HEIMDAL_VERSION)) -HOST_HEIMDAL_DEPENDENCIES = host-e2fsprogs host-ncurses host-pkgconf +HOST_HEIMDAL_DEPENDENCIES = host-e2fsprogs host-ncurses host-pkgconf host-libxcrypt HOST_HEIMDAL_AUTORECONF = YES HEIMDAL_INSTALL_STAGING = YES # static because of -fPIC issues with e2fsprogs on x86_64 host @@ -29,7 +29,7 @@ HOST_HEIMDAL_CONF_OPTS = \ --disable-heimdal-documentation # Don't use compile_et from e2fsprogs as it raises a build failure with samba4 -HOST_HEIMDAL_CONF_ENV = ac_cv_prog_COMPILE_ET=no MAKEINFO=true +HOST_HEIMDAL_CONF_ENV = ac_cv_prog_COMPILE_ET=no MAKEINFO=true LIBS=-lcrypt HEIMDAL_LICENSE = BSD-3-Clause HEIMDAL_LICENSE_FILES = LICENSE HEIMDAL_CPE_ID_VALID = YES From 44e739d031c8c5ed70a8ea513ff95dc8780a2a0f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 8 Feb 2025 16:03:31 +0100 Subject: [PATCH 21/92] package/heimdal: add missing dependencies on flex/bison As host-heimdal is only used by samba4, and samba4 already depends on host-flex and host-bison, the build issue fixed by this commit is not directly visible, but can be reproduced by doing "make host-heimdal" for example in our official Buildroot Docker container: /home/thomas/projets/buildroot/outputs/foo/build/host-heimdal-f4faaeaba371fff3f8d1bc14389f5e6d70ca8e17/missing: line 81: flex: command not found WARNING: 'flex' is missing on your system. You should only need it if you modified a '.l' file. You may want to install the Fast Lexical Analyzer package: make[4]: *** [Makefile:753: lex.c] Error 127 [...] updating lex.yylex.c ../../ylwrap: line 176: -d: command not found make[4]: *** [Makefile:756: parse.c] Error 127 Fix this by adding the missing dependencies. Signed-off-by: Thomas Petazzoni Signed-off-by: Julien Olivain --- package/heimdal/heimdal.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/heimdal/heimdal.mk b/package/heimdal/heimdal.mk index 155cb66e1f..f6c52f63aa 100644 --- a/package/heimdal/heimdal.mk +++ b/package/heimdal/heimdal.mk @@ -6,7 +6,7 @@ HEIMDAL_VERSION = f4faaeaba371fff3f8d1bc14389f5e6d70ca8e17 HEIMDAL_SITE = $(call github,heimdal,heimdal,$(HEIMDAL_VERSION)) -HOST_HEIMDAL_DEPENDENCIES = host-e2fsprogs host-ncurses host-pkgconf host-libxcrypt +HOST_HEIMDAL_DEPENDENCIES = host-e2fsprogs host-ncurses host-pkgconf host-libxcrypt host-flex host-bison HOST_HEIMDAL_AUTORECONF = YES HEIMDAL_INSTALL_STAGING = YES # static because of -fPIC issues with e2fsprogs on x86_64 host From edb4d9724b024717ce0c03932c4c2ae6f4b633f3 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 8 Feb 2025 16:04:11 +0100 Subject: [PATCH 22/92] toolchain/toolchain-external/toolchain-external-bootlin: drop Microblaze/bleeding-edge GCC 14.x has a significant bug where libatomic lacks some important functions, causing the toolchain to be pretty much unusable. Therefore, let's drop this toolchain entirely from our listing for now. See: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=118280 for more details. Fixes: http://autobuild.buildroot.net/results/dd081ca3c5746b980b0bcdf1f12b1a26c6b7ef86/ Signed-off-by: Thomas Petazzoni Signed-off-by: Julien Olivain --- support/scripts/gen-bootlin-toolchains | 6 + .../tests/toolchain/test_external_bootlin.py | 84 ----------- .../Config.in.options | 140 ------------------ .../toolchain-external-bootlin.hash | 12 -- .../toolchain-external-bootlin.mk | 36 ----- 5 files changed, 6 insertions(+), 272 deletions(-) diff --git a/support/scripts/gen-bootlin-toolchains b/support/scripts/gen-bootlin-toolchains index df16cff5c4..9ba5827cf6 100755 --- a/support/scripts/gen-bootlin-toolchains +++ b/support/scripts/gen-bootlin-toolchains @@ -478,6 +478,12 @@ def get_toolchains(): elif parts[2].startswith("bleeding-edge-"): variant = "bleeding-edge" version = parts[2][len("bleeding-edge-"):] + + # GCC 14.x on Microblaze is very broken, see + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=118280 + if arch in ["microblazeel", "microblazebe"] and variant == "bleeding-edge": + continue + tmp[(arch, libc, variant)] = version if len(tmp) == 0: diff --git a/support/testing/tests/toolchain/test_external_bootlin.py b/support/testing/tests/toolchain/test_external_bootlin.py index 6bcebf80c0..74fe1635c9 100644 --- a/support/testing/tests/toolchain/test_external_bootlin.py +++ b/support/testing/tests/toolchain/test_external_bootlin.py @@ -795,20 +795,6 @@ def test_run(self): TestExternalToolchain.common_check(self) -class TestExternalToolchainBootlinMicroblazebeGlibcBleedingEdge(TestExternalToolchain): - config = """ - BR2_microblazebe=y - BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_GLIBC_BLEEDING_EDGE=y - # BR2_TARGET_ROOTFS_TAR is not set - """ - toolchain_prefix = "microblaze-linux" - - def test_run(self): - TestExternalToolchain.common_check(self) - - class TestExternalToolchainBootlinMicroblazebeGlibcStable(TestExternalToolchain): config = """ BR2_microblazebe=y @@ -823,20 +809,6 @@ def test_run(self): TestExternalToolchain.common_check(self) -class TestExternalToolchainBootlinMicroblazebeMuslBleedingEdge(TestExternalToolchain): - config = """ - BR2_microblazebe=y - BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_MUSL_BLEEDING_EDGE=y - # BR2_TARGET_ROOTFS_TAR is not set - """ - toolchain_prefix = "microblaze-linux" - - def test_run(self): - TestExternalToolchain.common_check(self) - - class TestExternalToolchainBootlinMicroblazebeMuslStable(TestExternalToolchain): config = """ BR2_microblazebe=y @@ -851,20 +823,6 @@ def test_run(self): TestExternalToolchain.common_check(self) -class TestExternalToolchainBootlinMicroblazebeUclibcBleedingEdge(TestExternalToolchain): - config = """ - BR2_microblazebe=y - BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_UCLIBC_BLEEDING_EDGE=y - # BR2_TARGET_ROOTFS_TAR is not set - """ - toolchain_prefix = "microblaze-linux" - - def test_run(self): - TestExternalToolchain.common_check(self) - - class TestExternalToolchainBootlinMicroblazebeUclibcStable(TestExternalToolchain): config = """ BR2_microblazebe=y @@ -879,20 +837,6 @@ def test_run(self): TestExternalToolchain.common_check(self) -class TestExternalToolchainBootlinMicroblazeelGlibcBleedingEdge(TestExternalToolchain): - config = """ - BR2_microblazeel=y - BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_GLIBC_BLEEDING_EDGE=y - # BR2_TARGET_ROOTFS_TAR is not set - """ - toolchain_prefix = "microblazeel-linux" - - def test_run(self): - TestExternalToolchain.common_check(self) - - class TestExternalToolchainBootlinMicroblazeelGlibcStable(TestExternalToolchain): config = """ BR2_microblazeel=y @@ -907,20 +851,6 @@ def test_run(self): TestExternalToolchain.common_check(self) -class TestExternalToolchainBootlinMicroblazeelMuslBleedingEdge(TestExternalToolchain): - config = """ - BR2_microblazeel=y - BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_MUSL_BLEEDING_EDGE=y - # BR2_TARGET_ROOTFS_TAR is not set - """ - toolchain_prefix = "microblazeel-linux" - - def test_run(self): - TestExternalToolchain.common_check(self) - - class TestExternalToolchainBootlinMicroblazeelMuslStable(TestExternalToolchain): config = """ BR2_microblazeel=y @@ -935,20 +865,6 @@ def test_run(self): TestExternalToolchain.common_check(self) -class TestExternalToolchainBootlinMicroblazeelUclibcBleedingEdge(TestExternalToolchain): - config = """ - BR2_microblazeel=y - BR2_TOOLCHAIN_EXTERNAL=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y - BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_UCLIBC_BLEEDING_EDGE=y - # BR2_TARGET_ROOTFS_TAR is not set - """ - toolchain_prefix = "microblazeel-linux" - - def test_run(self): - TestExternalToolchain.common_check(self) - - class TestExternalToolchainBootlinMicroblazeelUclibcStable(TestExternalToolchain): config = """ BR2_microblazeel=y diff --git a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options index 1bbc0239e6..471dc55f44 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options +++ b/toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options @@ -1372,29 +1372,6 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_M68K_COLDFIRE_UCLIBC_STABLE https://toolchains.bootlin.com/ -config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_GLIBC_BLEEDING_EDGE - bool "microblazebe glibc bleeding-edge 2024.05-1" - depends on BR2_microblazebe - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 - depends on BR2_USE_MMU - select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 - select BR2_INSTALL_LIBSTDCPP - select BR2_TOOLCHAIN_HAS_THREADS - select BR2_TOOLCHAIN_HAS_THREADS_DEBUG - select BR2_TOOLCHAIN_HAS_THREADS - select BR2_TOOLCHAIN_HAS_THREADS - select BR2_TOOLCHAIN_HAS_THREADS_NPTL - select BR2_TOOLCHAIN_EXTERNAL_GLIBC - help - Bootlin toolchain for the microblazebe architecture, using - the glibc C library. This is a bleeding-edge version, which - means it is using the latest versions of gcc, gdb and - binutils. - - https://toolchains.bootlin.com/ - config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_GLIBC_STABLE bool "microblazebe glibc stable 2024.05-1" depends on BR2_microblazebe @@ -1418,29 +1395,6 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_GLIBC_STABLE https://toolchains.bootlin.com/ -config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_MUSL_BLEEDING_EDGE - bool "microblazebe musl bleeding-edge 2024.05-1" - depends on BR2_microblazebe - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 - depends on BR2_USE_MMU - select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 - select BR2_INSTALL_LIBSTDCPP - select BR2_TOOLCHAIN_HAS_THREADS - select BR2_TOOLCHAIN_HAS_THREADS_DEBUG - select BR2_TOOLCHAIN_HAS_THREADS - select BR2_TOOLCHAIN_HAS_THREADS - select BR2_TOOLCHAIN_HAS_THREADS_NPTL - select BR2_TOOLCHAIN_EXTERNAL_MUSL - help - Bootlin toolchain for the microblazebe architecture, using - the musl C library. This is a bleeding-edge version, which - means it is using the latest versions of gcc, gdb and - binutils. - - https://toolchains.bootlin.com/ - config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_MUSL_STABLE bool "microblazebe musl stable 2024.05-1" depends on BR2_microblazebe @@ -1464,30 +1418,6 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_MUSL_STABLE https://toolchains.bootlin.com/ -config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_UCLIBC_BLEEDING_EDGE - bool "microblazebe uclibc bleeding-edge 2024.05-1" - depends on BR2_microblazebe - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 - select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 - select BR2_USE_WCHAR - select BR2_ENABLE_LOCALE - select BR2_INSTALL_LIBSTDCPP - select BR2_TOOLCHAIN_HAS_THREADS - select BR2_TOOLCHAIN_HAS_THREADS_DEBUG - select BR2_TOOLCHAIN_HAS_THREADS - select BR2_TOOLCHAIN_HAS_THREADS - select BR2_TOOLCHAIN_HAS_THREADS_NPTL - select BR2_TOOLCHAIN_EXTERNAL_UCLIBC - help - Bootlin toolchain for the microblazebe architecture, using - the uclibc C library. This is a bleeding-edge version, - which means it is using the latest versions of gcc, gdb and - binutils. - - https://toolchains.bootlin.com/ - config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_UCLIBC_STABLE bool "microblazebe uclibc stable 2024.05-1" depends on BR2_microblazebe @@ -1512,29 +1442,6 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_UCLIBC_STABLE https://toolchains.bootlin.com/ -config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_GLIBC_BLEEDING_EDGE - bool "microblazeel glibc bleeding-edge 2024.05-1" - depends on BR2_microblazeel - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 - depends on BR2_USE_MMU - select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 - select BR2_INSTALL_LIBSTDCPP - select BR2_TOOLCHAIN_HAS_THREADS - select BR2_TOOLCHAIN_HAS_THREADS_DEBUG - select BR2_TOOLCHAIN_HAS_THREADS - select BR2_TOOLCHAIN_HAS_THREADS - select BR2_TOOLCHAIN_HAS_THREADS_NPTL - select BR2_TOOLCHAIN_EXTERNAL_GLIBC - help - Bootlin toolchain for the microblazeel architecture, using - the glibc C library. This is a bleeding-edge version, which - means it is using the latest versions of gcc, gdb and - binutils. - - https://toolchains.bootlin.com/ - config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_GLIBC_STABLE bool "microblazeel glibc stable 2024.05-1" depends on BR2_microblazeel @@ -1558,29 +1465,6 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_GLIBC_STABLE https://toolchains.bootlin.com/ -config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_MUSL_BLEEDING_EDGE - bool "microblazeel musl bleeding-edge 2024.05-1" - depends on BR2_microblazeel - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 - depends on BR2_USE_MMU - select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 - select BR2_INSTALL_LIBSTDCPP - select BR2_TOOLCHAIN_HAS_THREADS - select BR2_TOOLCHAIN_HAS_THREADS_DEBUG - select BR2_TOOLCHAIN_HAS_THREADS - select BR2_TOOLCHAIN_HAS_THREADS - select BR2_TOOLCHAIN_HAS_THREADS_NPTL - select BR2_TOOLCHAIN_EXTERNAL_MUSL - help - Bootlin toolchain for the microblazeel architecture, using - the musl C library. This is a bleeding-edge version, which - means it is using the latest versions of gcc, gdb and - binutils. - - https://toolchains.bootlin.com/ - config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_MUSL_STABLE bool "microblazeel musl stable 2024.05-1" depends on BR2_microblazeel @@ -1604,30 +1488,6 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_MUSL_STABLE https://toolchains.bootlin.com/ -config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_UCLIBC_BLEEDING_EDGE - bool "microblazeel uclibc bleeding-edge 2024.05-1" - depends on BR2_microblazeel - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_15 - select BR2_TOOLCHAIN_EXTERNAL_HAS_NO_GDBSERVER - select BR2_TOOLCHAIN_GCC_AT_LEAST_14 - select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_15 - select BR2_USE_WCHAR - select BR2_ENABLE_LOCALE - select BR2_INSTALL_LIBSTDCPP - select BR2_TOOLCHAIN_HAS_THREADS - select BR2_TOOLCHAIN_HAS_THREADS_DEBUG - select BR2_TOOLCHAIN_HAS_THREADS - select BR2_TOOLCHAIN_HAS_THREADS - select BR2_TOOLCHAIN_HAS_THREADS_NPTL - select BR2_TOOLCHAIN_EXTERNAL_UCLIBC - help - Bootlin toolchain for the microblazeel architecture, using - the uclibc C library. This is a bleeding-edge version, - which means it is using the latest versions of gcc, gdb and - binutils. - - https://toolchains.bootlin.com/ - config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_UCLIBC_STABLE bool "microblazeel uclibc stable 2024.05-1" depends on BR2_microblazeel diff --git a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash index daa5c4cc79..1515f35a91 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash +++ b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.hash @@ -104,28 +104,16 @@ sha256 92b41ec8da2da233c65ce96ad9db5e849d0d687378c799f774df6efe7c8f0e28 m68k-6 sha256 6ef31adc06bb53b0b9252bbf7cdc93c22f0d6838dc9f51a4dc6e0fe2016eceff m68k-coldfire--uclibc--bleeding-edge-2024.05-1.tar.xz # From https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-coldfire/tarballs/m68k-coldfire--uclibc--stable-2024.05-1.sha256 sha256 370953f7c1e3bcf8b4e6849906991019f742fbde8532850aabd4eb3978e4a933 m68k-coldfire--uclibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--glibc--bleeding-edge-2024.05-1.sha256 -sha256 f8fe7afda005b6f3fc3a602c6d8d1e1d524b2ebb5452a736351994723a9faf72 microblazebe--glibc--bleeding-edge-2024.05-1.tar.xz # From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--glibc--stable-2024.05-1.sha256 sha256 7a24a6cd76175d77134a0d02852204c548c9d2722e08ecc02ccf49f4c477792d microblazebe--glibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--musl--bleeding-edge-2024.05-1.sha256 -sha256 5e51c0576acc7043d74644fed43b10e0aa75c4025741edcdd3e636d528270973 microblazebe--musl--bleeding-edge-2024.05-1.tar.xz # From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--musl--stable-2024.05-1.sha256 sha256 f1e0d9406fdb211c9f44b71d4d3b4b68ac5dec4e379b24ff8a488f7945b99dfe microblazebe--musl--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--uclibc--bleeding-edge-2024.05-1.sha256 -sha256 fb2a4dc7407699c36046f1fc0ff10833805dfb9c8aa4e2c30adcda45de7474f6 microblazebe--uclibc--bleeding-edge-2024.05-1.tar.xz # From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs/microblazebe--uclibc--stable-2024.05-1.sha256 sha256 17c6aa01b8421961b17eca4950cab8d292aa87d073f325525de1e77c5f7a5546 microblazebe--uclibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--glibc--bleeding-edge-2024.05-1.sha256 -sha256 686905d647c24fb1f95dedb95c4a764d263a577cce673ea629d87c1a8986e9c8 microblazeel--glibc--bleeding-edge-2024.05-1.tar.xz # From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--glibc--stable-2024.05-1.sha256 sha256 2468c298089873e4d86026b84ca68e46b4802413639a55f2db1c6aba181d66d6 microblazeel--glibc--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--musl--bleeding-edge-2024.05-1.sha256 -sha256 ef1d35997bea684dfe5ee759b6668c309ee308956a3c82188402f5c42eba92db microblazeel--musl--bleeding-edge-2024.05-1.tar.xz # From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--musl--stable-2024.05-1.sha256 sha256 72611e45e0a77eac21b04bfae70395b8bcfaf2c969fe51638db48a94ca9030f4 microblazeel--musl--stable-2024.05-1.tar.xz -# From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--uclibc--bleeding-edge-2024.05-1.sha256 -sha256 bdf72671801ff48b232f12f13de5f3aaf3180a8e93c680ab59a1023aac3ddfd7 microblazeel--uclibc--bleeding-edge-2024.05-1.tar.xz # From https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs/microblazeel--uclibc--stable-2024.05-1.sha256 sha256 49657597e55aa7d771cb4546c1d37d7ab9408b426d8c45f1bf61d90a53322a65 microblazeel--uclibc--stable-2024.05-1.tar.xz # From https://toolchains.bootlin.com/downloads/releases/toolchains/mips32/tarballs/mips32--glibc--bleeding-edge-2024.05-1.sha256 diff --git a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk index a3d8ce215c..2ba7bf10da 100644 --- a/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk +++ b/toolchain/toolchain-external/toolchain-external-bootlin/toolchain-external-bootlin.mk @@ -318,72 +318,36 @@ TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = m68k-coldfire--uclibc--stable-$(TOOLCHAIN_EX TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/m68k-coldfire/tarballs endif -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazebe--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz -TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs -endif - ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_GLIBC_STABLE),y) TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazebe--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs endif -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazebe--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz -TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs -endif - ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_MUSL_STABLE),y) TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazebe--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs endif -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazebe--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz -TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs -endif - ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEBE_UCLIBC_STABLE),y) TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazebe--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazebe/tarballs endif -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_GLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazeel--glibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz -TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs -endif - ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_GLIBC_STABLE),y) TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazeel--glibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs endif -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_MUSL_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazeel--musl--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz -TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs -endif - ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_MUSL_STABLE),y) TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazeel--musl--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs endif -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_UCLIBC_BLEEDING_EDGE),y) -TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 -TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazeel--uclibc--bleeding-edge-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz -TOOLCHAIN_EXTERNAL_BOOTLIN_SITE = https://toolchains.bootlin.com/downloads/releases/toolchains/microblazeel/tarballs -endif - ifeq ($(BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_MICROBLAZEEL_UCLIBC_STABLE),y) TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION = 2024.05-1 TOOLCHAIN_EXTERNAL_BOOTLIN_SOURCE = microblazeel--uclibc--stable-$(TOOLCHAIN_EXTERNAL_BOOTLIN_VERSION).tar.xz From 5f5e35104322e72a2d683248e86b157c9d0f2819 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sat, 8 Feb 2025 16:04:12 +0100 Subject: [PATCH 23/92] package/gcc: disable GCC 14.x on Microblaze GCC 14.x is badly broken on Microblaze, with important functions missing from libatomic, causing build failures in a huge number of packages. The issue has been reported upstream at https://gcc.gnu.org/bugzilla/show_bug.cgi?id=118280 but still isn't fixed. For the time being, let's disable GCC 14.x on Microblaze. Fixes: http://autobuild.buildroot.net/results/6fea0ecaa90b24da4e5575565b88018ea95e72c0/ Signed-off-by: Thomas Petazzoni Signed-off-by: Julien Olivain --- package/gcc/Config.in.host | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index 911bc2f4de..10fe4bf609 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -44,6 +44,9 @@ config BR2_GCC_VERSION_14_X # powerpc spe support has been deprecated since gcc 8.x. # https://gcc.gnu.org/ml/gcc/2018-04/msg00102.html depends on !BR2_POWERPC_CPU_HAS_SPE + # Severely broken on Microblaze + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=118280 + depends on !BR2_microblaze select BR2_TOOLCHAIN_GCC_AT_LEAST_14 endchoice From 912a8458a96a7ee3fb391a507244a9084b03fb72 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Thu, 6 Feb 2025 10:33:28 -0700 Subject: [PATCH 24/92] package/qemu: fix build with glibc >= 2.41 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When host or target qemu is built with glibc >= 2.41 and Linux user-land emulation (BR2_PACKAGE_QEMU_LINUX_USER=y or BR2_PACKAGE_HOST_QEMU_LINUX_USER_MODE=y), compilation fails with output: ../linux-user/syscall.c:362:8: error: redefinition of ‘struct sched_attr’ 362 | struct sched_attr { | ^~~~~~~~~~ In file included from /usr/include/bits/sched.h:63, from /usr/include/sched.h:43, from /usr/include/pthread.h:22, from /home/buildroot/buildroot/output/per-package/host-qemu/host/include/glib-2.0/glib/deprecated/gthread.h:126, from /home/buildroot/buildroot/output/per-package/host-qemu/host/include/glib-2.0/glib.h:115, from /home/buildroot/buildroot/output/build/host-qemu-9.2.0/include/glib-compat.h:32, from /home/buildroot/buildroot/output/build/host-qemu-9.2.0/include/qemu/osdep.h:161, from ../linux-user/syscall.c:20: /usr/include/linux/sched/types.h:98:8: note: originally defined here 98 | struct sched_attr { | ^~~~~~~~~~ For information, the Buildroot glibc package has been bumped in commit [1]. Also, major distributions are starting to publish updates to glibc 2.41. See for example Arch Linux update [2]. This commit adds a package patch to solve this issue. Fixes: - https://autobuild.buildroot.org/results/e8733bdf78d8e9448988c3d300c43a47f62375d8/ - and many others... [1] https://gitlab.com/buildroot.org/buildroot/-/commit/6ecab31fad12a494ec0d2a3767c736a55c80a769 [2] https://gitlab.archlinux.org/archlinux/packaging/packages/glibc/-/commit/7cebc144906a0fb68a5f6e75985b386c722ffbd9 Signed-off-by: James Hilliard [Julien: reworded the commit log] Signed-off-by: Julien Olivain --- ...ed_attr-Do-not-define-for-glibc-2.41.patch | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 package/qemu/0003-sched_attr-Do-not-define-for-glibc-2.41.patch diff --git a/package/qemu/0003-sched_attr-Do-not-define-for-glibc-2.41.patch b/package/qemu/0003-sched_attr-Do-not-define-for-glibc-2.41.patch new file mode 100644 index 0000000000..11edc27c2f --- /dev/null +++ b/package/qemu/0003-sched_attr-Do-not-define-for-glibc-2.41.patch @@ -0,0 +1,49 @@ +From 66b1926d72ef51d4d59d0f97061f26a75651e265 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 11 Oct 2024 12:31:40 -0700 +Subject: [PATCH] sched_attr: Do not define for glibc >= 2.41 + +glibc 2.41+ has added [1] definitions for sched_setattr and sched_getattr functions +and struct sched_attr. Therefore, it needs to be checked for here as well before +defining sched_attr + +Define sched_attr conditionally on SCHED_ATTR_SIZE_VER0 + +Fixes builds with glibc/trunk + +[1] https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=21571ca0d70302909cf72707b2a7736cf12190a0;hp=298bc488fdc047da37482f4003023cb9adef78f8 + +Signed-off-by: Khem Raj +Cc: Laurent Vivier +Cc: Paolo Bonzini +Signed-off-by: James Hilliard +Upstream: https://patchwork.kernel.org/project/qemu-devel/patch/20241011193140.1047648-1-raj.khem@gmail.com/ +--- + linux-user/syscall.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/linux-user/syscall.c b/linux-user/syscall.c +index 1ce4c79784..a407d4a023 100644 +--- a/linux-user/syscall.c ++++ b/linux-user/syscall.c +@@ -358,7 +358,8 @@ _syscall3(int, sys_sched_getaffinity, pid_t, pid, unsigned int, len, + #define __NR_sys_sched_setaffinity __NR_sched_setaffinity + _syscall3(int, sys_sched_setaffinity, pid_t, pid, unsigned int, len, + unsigned long *, user_mask_ptr); +-/* sched_attr is not defined in glibc */ ++/* sched_attr is not defined in glibc < 2.41 */ ++#ifndef SCHED_ATTR_SIZE_VER0 + struct sched_attr { + uint32_t size; + uint32_t sched_policy; +@@ -371,6 +372,7 @@ struct sched_attr { + uint32_t sched_util_min; + uint32_t sched_util_max; + }; ++#endif + #define __NR_sys_sched_getattr __NR_sched_getattr + _syscall4(int, sys_sched_getattr, pid_t, pid, struct sched_attr *, attr, + unsigned int, size, unsigned int, flags); +-- +2.34.1 + From 170642b68d00014a69ea88451303e264a37e85c2 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 5 Feb 2025 08:46:15 +0100 Subject: [PATCH 25/92] package/perl: bump to version 5.40.1 For release note, see: https://perldoc.perl.org/5.40.1/perldelta diff README: -Perl is Copyright (C) 1993 - 2024 by Larry Wall and others. +Perl is Copyright (C) 1993 - 2025 by Larry Wall and others. Signed-off-by: Francois Perrad [Julien: add link to release note] Signed-off-by: Julien Olivain --- package/perl/perl.hash | 14 +++++++------- package/perl/perl.mk | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package/perl/perl.hash b/package/perl/perl.hash index aba2844036..04ebf83b33 100644 --- a/package/perl/perl.hash +++ b/package/perl/perl.hash @@ -1,12 +1,12 @@ -# Hashes from: https://www.cpan.org/src/5.0/perl-5.40.0.tar.xz.{md5,sha1,sha256}.txt -md5 cfe14ef0709b9687f9c514042e8e1e82 perl-5.40.0.tar.xz -sha1 4a3af1f62afc611aa1552adc6c7ec389e9723bce perl-5.40.0.tar.xz -sha256 d5325300ad267624cb0b7d512cfdfcd74fa7fe00c455c5b51a6bd53e5e199ef9 perl-5.40.0.tar.xz +# Hashes from: https://www.cpan.org/src/5.0/perl-5.40.1.tar.xz.{md5,sha1,sha256}.txt +md5 bab3547a5cdf2302ee0396419d74a42e perl-5.40.1.tar.xz +sha1 4ffe5246c791df884363aed05ba81ba41cb02084 perl-5.40.1.tar.xz +sha256 dfa20c2eef2b4af133525610bbb65dd13777ecf998c9c5b1ccf0d308e732ee3f perl-5.40.1.tar.xz -# Hash from: https://github.com/arsv/perl-cross/releases/download/1.6/perl-cross-1.6.hash -sha256 5abf198ee50ce9e69eb68fede68c87f65241caa744e4203e97490fa59b45ed69 perl-cross-1.6.tar.gz +# Hash from: https://github.com/arsv/perl-cross/releases/download/1.6.1/perl-cross-1.6.1.hash +sha256 b5f4b4457bbd7be37adac8ee423beedbcdba8963a85f79770f5e701dabc5550f perl-cross-1.6.1.tar.gz # Locally calculated sha256 dd90d4f42e4dcadf5a7c09eea0189d93c7b37ae560c91f0f6d5233ed3b9292a2 Artistic sha256 d77d235e41d54594865151f4751e835c5a82322b0e87ace266567c3391a4b912 Copying -sha256 05fcf86432bd78754c7e325d4be44a5968344c01cc08c004b685172ea508ec23 README +sha256 af805523b88a8ebb60afc009caaf247a498208502f7b8b3d9d3e329fcfb1dc3b README diff --git a/package/perl/perl.mk b/package/perl/perl.mk index dc7c0b8d42..37b9fe185d 100644 --- a/package/perl/perl.mk +++ b/package/perl/perl.mk @@ -6,7 +6,7 @@ # When updating the version here, also update utils/scancpan PERL_VERSION_MAJOR = 40 -PERL_VERSION = 5.$(PERL_VERSION_MAJOR).0 +PERL_VERSION = 5.$(PERL_VERSION_MAJOR).1 PERL_SITE = https://www.cpan.org/src/5.0 PERL_SOURCE = perl-$(PERL_VERSION).tar.xz PERL_LICENSE = Artistic or GPL-1.0+ @@ -15,7 +15,7 @@ PERL_CPE_ID_VENDOR = perl PERL_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) PERL_INSTALL_STAGING = YES -PERL_CROSS_VERSION = 1.6 +PERL_CROSS_VERSION = 1.6.1 # DO NOT refactor with the github helper (the result is not the same) PERL_CROSS_SITE = https://github.com/arsv/perl-cross/releases/download/$(PERL_CROSS_VERSION) PERL_CROSS_SOURCE = perl-cross-$(PERL_CROSS_VERSION).tar.gz From f26dfdc842c7f95102f13f4bc863a404821f57f3 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 8 Feb 2025 15:23:17 +0100 Subject: [PATCH 26/92] support/docker: add flake8 command When check-package fail due to flake8 coding style checks, it suggest to use flake8 command line: run 'flake8' and fix the warnings But flake8 is actually missing from the container used by utils/docker-run, so add it to the container as well. Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- support/docker/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile index 8c6e2add60..6f76cd5114 100644 --- a/support/docker/Dockerfile +++ b/support/docker/Dockerfile @@ -30,6 +30,7 @@ RUN apt-get -o APT::Retries=3 install -y --no-install-recommends \ cpio \ cvs \ file \ + flake8 \ g++-multilib \ git \ libc6:i386 \ From ef15efdd2c422a8c0df074f46978045e7e8deeb8 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 8 Feb 2025 15:23:18 +0100 Subject: [PATCH 27/92] support/testing/tests/package: sample_python_*: fix flake8 errors flake8 5.0.4 provided by Debian 12 (bookworm) now detect a missing whitespace after 'assert' keyword: E275 missing whitespace after keyword Signed-off-by: Romain Naour [Peter: fix subject, drop extra paranthesises] Signed-off-by: Peter Korsgaard --- support/testing/tests/package/sample_python_attrs.py | 8 ++++---- support/testing/tests/package/sample_python_colorzero.py | 6 +++--- support/testing/tests/package/sample_python_constantly.py | 6 +++--- support/testing/tests/package/sample_python_gpiozero.py | 2 +- support/testing/tests/package/sample_python_passlib.py | 4 ++-- support/testing/tests/package/sample_python_rpi_gpio.py | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/support/testing/tests/package/sample_python_attrs.py b/support/testing/tests/package/sample_python_attrs.py index f224944914..8199cc666b 100644 --- a/support/testing/tests/package/sample_python_attrs.py +++ b/support/testing/tests/package/sample_python_attrs.py @@ -8,8 +8,8 @@ class Obj(object): obj1 = Obj(2) -assert(obj1.x == 2) -assert(obj1.y == 1) +assert obj1.x == 2 +assert obj1.y == 1 obj2 = Obj(3, 4) -assert(obj2.x == 3) -assert(obj2.y == 4) +assert obj2.x == 3 +assert obj2.y == 4 diff --git a/support/testing/tests/package/sample_python_colorzero.py b/support/testing/tests/package/sample_python_colorzero.py index 23862a816d..8d4daa560d 100644 --- a/support/testing/tests/package/sample_python_colorzero.py +++ b/support/testing/tests/package/sample_python_colorzero.py @@ -3,6 +3,6 @@ red = Color('red') green = Color('lime') blue = Color('blue') -assert(red.rgb == (1.0, 0.0, 0.0)) -assert(green.rgb == (0.0, 1.0, 0.0)) -assert(blue.rgb == (0.0, 0.0, 1.0)) +assert red.rgb == (1.0, 0.0, 0.0) +assert green.rgb == (0.0, 1.0, 0.0) +assert blue.rgb == (0.0, 0.0, 1.0) diff --git a/support/testing/tests/package/sample_python_constantly.py b/support/testing/tests/package/sample_python_constantly.py index 570cf85b23..b826dd4b71 100644 --- a/support/testing/tests/package/sample_python_constantly.py +++ b/support/testing/tests/package/sample_python_constantly.py @@ -14,6 +14,6 @@ def get(cls, rc): print(list(RESULT.iterconstants())) -assert(RESULT.OK < RESULT.FAIL) -assert(RESULT.OK.value > RESULT.FAIL.value) -assert(RESULT.get(-5) == RESULT.FAIL) +assert RESULT.OK < RESULT.FAIL +assert RESULT.OK.value > RESULT.FAIL.value +assert RESULT.get(-5) == RESULT.FAIL diff --git a/support/testing/tests/package/sample_python_gpiozero.py b/support/testing/tests/package/sample_python_gpiozero.py index b95df07fe7..e20a9c8d34 100644 --- a/support/testing/tests/package/sample_python_gpiozero.py +++ b/support/testing/tests/package/sample_python_gpiozero.py @@ -2,4 +2,4 @@ piBoardInfo = pi_info('a020d3') # 3B+ -assert(piBoardInfo.model == '3B+') +assert piBoardInfo.model == '3B+' diff --git a/support/testing/tests/package/sample_python_passlib.py b/support/testing/tests/package/sample_python_passlib.py index 3ab348b9e4..80afbf18d0 100644 --- a/support/testing/tests/package/sample_python_passlib.py +++ b/support/testing/tests/package/sample_python_passlib.py @@ -1,5 +1,5 @@ from passlib.hash import pbkdf2_sha256 hash = pbkdf2_sha256.hash("password") -assert(pbkdf2_sha256.verify("passWord", hash) is False) -assert(pbkdf2_sha256.verify("password", hash) is True) +assert pbkdf2_sha256.verify("passWord", hash) is False +assert pbkdf2_sha256.verify("password", hash) is True diff --git a/support/testing/tests/package/sample_python_rpi_gpio.py b/support/testing/tests/package/sample_python_rpi_gpio.py index 5f0d884e07..e0bd96f631 100644 --- a/support/testing/tests/package/sample_python_rpi_gpio.py +++ b/support/testing/tests/package/sample_python_rpi_gpio.py @@ -1,6 +1,6 @@ try: import RPi.GPIO # noqa except RuntimeError as e: - assert(str(e) == 'This module can only be run on a Raspberry Pi!') + assert str(e) == 'This module can only be run on a Raspberry Pi!' else: raise RuntimeError('Import succeeded when it should not have!') From 4f78d362aa907ee019b9f43c56c8f4322d242f3c Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 8 Feb 2025 15:23:19 +0100 Subject: [PATCH 28/92] utils/checkpackagelib: fix shellcheck tests after update to shellcheck 0.9.0 shellcheck tests needs to be updated after shellcheck 0.9.0 update due to changes in errors/warning reporting: utils/checkpackagelib/test_tool.py::test_Shellcheck[missing shebang-empty.sh--expected0] FAILED [ 98%] utils/checkpackagelib/test_tool.py::test_Shellcheck[2 warnings-unused.sh-unused=""-expected3] FAILED [ 99%] utils/checkpackagelib/test_tool.py::test_Shellcheck[tab-tab.sh-\t#!/bin/sh-expected4] FAILED [100%] Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- utils/checkpackagelib/test_tool.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/utils/checkpackagelib/test_tool.py b/utils/checkpackagelib/test_tool.py index cfa826f57c..56326398d3 100644 --- a/utils/checkpackagelib/test_tool.py +++ b/utils/checkpackagelib/test_tool.py @@ -100,7 +100,7 @@ def test_Flake8(testname, filename, string, expected): '', ["dir/empty.sh:0: run 'shellcheck' and fix the warnings", "In dir/empty.sh line 1:\n" - "^-- SC2148: Tips depend on target shell and yours is unknown. Add a shebang or a 'shell' directive.\n" + "^-- SC2148 (error): Tips depend on target shell and yours is unknown. Add a shebang or a 'shell' directive.\n" "For more information:\n" " https://www.shellcheck.net/wiki/SC2148 -- Tips depend on target shell and y..."]), ('sh shebang', @@ -117,8 +117,8 @@ def test_Flake8(testname, filename, string, expected): ["dir/unused.sh:0: run 'shellcheck' and fix the warnings", "In dir/unused.sh line 1:\n" 'unused=""\n' - "^-- SC2148: Tips depend on target shell and yours is unknown. Add a shebang or a 'shell' directive.\n" - "^----^ SC2034: unused appears unused. Verify use (or export if used externally).\n" + "^-- SC2148 (error): Tips depend on target shell and yours is unknown. Add a shebang or a 'shell' directive.\n" + "^----^ SC2034 (warning): unused appears unused. Verify use (or export if used externally).\n" "For more information:\n" " https://www.shellcheck.net/wiki/SC2148 -- Tips depend on target shell and y...\n" " https://www.shellcheck.net/wiki/SC2034 -- unused appears unused. Verify use..."]), @@ -128,7 +128,7 @@ def test_Flake8(testname, filename, string, expected): ["dir/tab.sh:0: run 'shellcheck' and fix the warnings", "In dir/tab.sh line 1:\n" '\t#!/bin/sh\n' - "^-- SC1114: Remove leading spaces before the shebang.\n" + "^-- SC1114 (error): Remove leading spaces before the shebang.\n" "For more information:\n" " https://www.shellcheck.net/wiki/SC1114 -- Remove leading spaces before the ..."]), ] From aebbf57354d76ce22fd51718e07dc0a3cd3db116 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 8 Feb 2025 15:23:20 +0100 Subject: [PATCH 29/92] board/terasic/de10nano_cyclone5: disable shellcheck SC2276 Disable shellcheck SC2276 warning introduced in v0.7.2 [1] for barebox environment file. [1] https://github.com/koalaman/shellcheck/commit/fbb14d6b384a65ee16781966d9d240db9ed7b644 Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- board/terasic/de10nano_cyclone5/barebox-env/boot/mmc | 1 + 1 file changed, 1 insertion(+) diff --git a/board/terasic/de10nano_cyclone5/barebox-env/boot/mmc b/board/terasic/de10nano_cyclone5/barebox-env/boot/mmc index fed2b0b45d..6cf307b80b 100644 --- a/board/terasic/de10nano_cyclone5/barebox-env/boot/mmc +++ b/board/terasic/de10nano_cyclone5/barebox-env/boot/mmc @@ -1,5 +1,6 @@ #!/bin/sh +# shellcheck disable=SC2276 global.bootm.oftree="/boot/socfpga_cyclone5_de0_nano_soc.dtb" global.bootm.image="/boot/zImage" From 48ccb7d1d7a12567c79fa296336c3086108f144c Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 8 Feb 2025 15:23:21 +0100 Subject: [PATCH 30/92] package/kodi/br-kodi: fix shellcheck SC2317 & SC2329 As stated in shellcheck wiki about SC2329 [1] "ShellCheck is currently bad at figuring out functions that are invoked via trap. In such cases, please ignore the message with a directive." While adding SC2329 check after shellcheck v0.10.0 release, it also reduced the amount of false result returned by shellcheck v0.9.0. So disable SC2317 and SC2329. [1] https://www.shellcheck.net/wiki/SC2329 [2] https://github.com/koalaman/shellcheck/commit/4f81dbe839091a06a5cfaea695cf1c451ff07565 Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- package/kodi/br-kodi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/kodi/br-kodi b/package/kodi/br-kodi index 83d4d4e5ac..b776b5d96c 100755 --- a/package/kodi/br-kodi +++ b/package/kodi/br-kodi @@ -5,6 +5,8 @@ KODI="${1}" shift +# shellcheck disable=SC2329 # https://www.shellcheck.net/wiki/SC2329 +# shellcheck disable=SC2317 # shellcheck 0.9.0 "spammy" # In case someone asked we terminate, just kill # the Kodi process trap_kill() { From 402b1afcdff446b335cc249d00e661e81b6b4759 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 8 Feb 2025 15:23:22 +0100 Subject: [PATCH 31/92] package/kodi/br-kodi: fix shellcheck SC2086 Shellcheck 0.9.0 now report SC2086: In package/kodi/br-kodi line 38: exit ${ret} ^----^ SC2086 (info): Double quote to prevent globbing and word splitting. Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- package/kodi/br-kodi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/kodi/br-kodi b/package/kodi/br-kodi index b776b5d96c..2467afed30 100755 --- a/package/kodi/br-kodi +++ b/package/kodi/br-kodi @@ -35,4 +35,4 @@ while [ ${LOOP} -eq 1 ]; do ;; esac done -exit ${ret} +exit "${ret}" From 13deac1e39855cc8df1433299a6741a085afca46 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 8 Feb 2025 15:23:23 +0100 Subject: [PATCH 32/92] support/download/{curl, cvs, git, svn}: disable new shellcheck 0.9.0 errors As for SC1090 and SC2016 [1], disable SC1091 and SC2294 too since they are now reported by shellcheck 0.9.0: In support/download/curl line 42: eval ${CURL} "${@}" ^--^ SC2294 (warning): eval negates the benefit of arrays. Drop eval to preserve whitespace/symbols (or eval as string). [1] bcee3ca6d66d30de4b0cd8186ce4c72020705df8 Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- support/download/curl | 1 + support/download/cvs | 1 + support/download/git | 2 ++ support/download/svn | 2 ++ 4 files changed, 6 insertions(+) diff --git a/support/download/curl b/support/download/curl index bea4485a6c..2124fe7cad 100755 --- a/support/download/curl +++ b/support/download/curl @@ -39,6 +39,7 @@ _curl() { # Note: please keep command below aligned with what is printed above _plain_curl() { # shellcheck disable=SC2086 # We want splitting + # shellcheck disable=SC2294 eval ${CURL} "${@}" } diff --git a/support/download/cvs b/support/download/cvs index a6840fea7b..a52e543e44 100755 --- a/support/download/cvs +++ b/support/download/cvs @@ -47,6 +47,7 @@ _cvs() { # Note: please keep command below aligned with what is printed above _plain_cvs() { # shellcheck disable=SC2086 # We really want word splitting in CVS + # shellcheck disable=SC2294 eval timeout 10m ${CVS} "${@}" } diff --git a/support/download/git b/support/download/git index d49016e90c..8123bc3153 100755 --- a/support/download/git +++ b/support/download/git @@ -22,6 +22,7 @@ set -e # GIT : the git command to call # shellcheck disable=SC1090 # Only provides mk_tar_gz() +# shellcheck disable=SC1091 . "${0%/*}/helpers" # Save our path and options in case we need to call ourselves again @@ -91,6 +92,7 @@ _git() { # Note: please keep command below aligned with what is printed above _plain_git() { # shellcheck disable=SC2086 # We want word-splitting for GIT + # shellcheck disable=SC2294 eval GIT_DIR="${git_cache}/.git" ${GIT} "${@}" } diff --git a/support/download/svn b/support/download/svn index 1decb2310b..ff33f1fa39 100755 --- a/support/download/svn +++ b/support/download/svn @@ -22,6 +22,7 @@ set -e # SVN : the svn command to call # shellcheck disable=SC1090 # Only provides mk_tar_gz() +# shellcheck disable=SC1091 . "${0%/*}/helpers" quiet= @@ -52,6 +53,7 @@ _svn() { # Note: please keep command below aligned with what is printed above _plain_svn() { # shellcheck disable=SC2086 # We want word-splitting for SVN + # shellcheck disable=SC2294 eval ${SVN} "${@}" } From 0100c6e402b6cf67c580b4b6b43b958d1c4f761f Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 8 Feb 2025 15:23:24 +0100 Subject: [PATCH 33/92] support/scripts/mkusers: fix shellcheck error related to auto_id SC2086 is now reported for auto_id since shellcheck 0.9.0: In support/scripts/mkusers line 453: add_one_group "${g}" ${auto_id} ^--------^ SC2086 (info): Double quote to prevent globbing and word splitting. So quote it to get rid of this error. Signed-off-by: Romain Naour [Peter: quote variable instead of disabling check] Signed-off-by: Peter Korsgaard --- support/scripts/mkusers | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/scripts/mkusers b/support/scripts/mkusers index 08f3344518..87a36a89a1 100755 --- a/support/scripts/mkusers +++ b/support/scripts/mkusers @@ -450,7 +450,7 @@ main() { auto_id=${AUTO_USER_ID} fi for g in ${groups//,/ }; do - add_one_group "${g}" ${auto_id} + add_one_group "${g}" "${auto_id}" done fi done From ef80b710f214fe76dca1aa666eb5e7cea9702ca0 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 8 Feb 2025 15:23:25 +0100 Subject: [PATCH 34/92] utils/config: fix shellcheck errors SC2086 is now reported for missing Double quote around $FN since shellcheck 0.9.0: In utils/config line 175: if grep -q "# ${BR2_PREFIX}$ARG is not set" $FN ; then ^-^ SC2086 (info): Double quote to prevent globbing and word splitting. In utils/config line 178: if V="$(grep "^${BR2_PREFIX}$ARG=" $FN)"; then ^-^ SC2086 (info): Double quote to prevent globbing and word splitting. Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- utils/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/config b/utils/config index dfaaf46cd7..038986ca6c 100755 --- a/utils/config +++ b/utils/config @@ -172,10 +172,10 @@ while [ "$1" != "" ] ; do ;; --state|-s) - if grep -q "# ${BR2_PREFIX}$ARG is not set" $FN ; then + if grep -q "# ${BR2_PREFIX}$ARG is not set" "$FN" ; then echo n else - if V="$(grep "^${BR2_PREFIX}$ARG=" $FN)"; then + if V="$(grep "^${BR2_PREFIX}$ARG=" "$FN")"; then V="${V/#${BR2_PREFIX}$ARG=/}" V="${V/#\"/}" V="${V/%\"/}" From 236a890d80d24d9a43091846e693588c47b4d249 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 8 Feb 2025 15:23:26 +0100 Subject: [PATCH 35/92] package/mdnsd: disable shellcheck SC2317 for S50mdnsd shellcheck 0.9.0 throw an error due to SC2317 check on sysv init scripts. Indeed, start/stop/restart/reload function can't be reached in one execution. See: https://www.shellcheck.net/wiki/SC2317 Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- package/mdnsd/S50mdnsd | 1 + 1 file changed, 1 insertion(+) diff --git a/package/mdnsd/S50mdnsd b/package/mdnsd/S50mdnsd index 1c2b71802c..13b65d0c69 100644 --- a/package/mdnsd/S50mdnsd +++ b/package/mdnsd/S50mdnsd @@ -1,4 +1,5 @@ #!/bin/sh +# shellcheck disable=SC2317 # Don't warn about unreachable commands in this file DAEMON=mdnsd MDNSD=/usr/sbin/$DAEMON From be20c12e157c0e67875d8031de17df41a9c55679 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Sun, 9 Feb 2025 16:05:13 +0100 Subject: [PATCH 36/92] package/mdnsd/S50mdnsd: do not clobber exit code As pointed out by shellcheck, the exit code of the start/stop/restart/reload command is clobbered by the 'echo "FAIL'" statement: In package/mdnsd/S50mdnsd line 52: exit $? ^-- SC2320 (warning): This $? refers to echo/printf, not a previous command. Assign to variable to avoid it being overwritten. So introduce a $status variable to keep track of it, similar to how it is done in S40iwd. Signed-off-by: Peter Korsgaard --- package/mdnsd/S50mdnsd | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/package/mdnsd/S50mdnsd b/package/mdnsd/S50mdnsd index 13b65d0c69..803ac12a8e 100644 --- a/package/mdnsd/S50mdnsd +++ b/package/mdnsd/S50mdnsd @@ -37,7 +37,9 @@ reload() { case "$1" in start|stop|restart|reload) - if "$1"; then + "$1" + status=$? + if [ "$status" -eq 0 ]; then echo "OK" else echo "FAIL" @@ -49,4 +51,4 @@ case "$1" in ;; esac -exit $? +exit "$status" From 756012d25740b36f24ed1e6dde91de357ed4f010 Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Sun, 9 Feb 2025 19:38:28 +0100 Subject: [PATCH 37/92] package/seatd: bump to 0.9.1 Announcement: - https://git.sr.ht/~kennylevinsen/seatd/refs/0.9.1 - https://git.sr.ht/~kennylevinsen/seatd/refs/0.9.0 Signed-off-by: Thomas Devoogdt Signed-off-by: Julien Olivain --- package/seatd/seatd.hash | 2 +- package/seatd/seatd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/seatd/seatd.hash b/package/seatd/seatd.hash index e1db897d44..ce70480d50 100644 --- a/package/seatd/seatd.hash +++ b/package/seatd/seatd.hash @@ -1,5 +1,5 @@ # Calculated locally -sha256 a562a44ee33ccb20954a1c1ec9a90ecb2db7a07ad6b18d0ac904328efbcf65a0 0.8.0.tar.gz +sha256 819979c922a0be258aed133d93920bce6a3d3565a60588d6d372ce9db2712cd3 0.9.1.tar.gz # License files sha256 282a494803d666616bd726e0279636b5f6a31387ae19a707459074050f2600d3 LICENSE diff --git a/package/seatd/seatd.mk b/package/seatd/seatd.mk index 27f3c8646f..69be691cf6 100644 --- a/package/seatd/seatd.mk +++ b/package/seatd/seatd.mk @@ -4,7 +4,7 @@ # ################################################################################ -SEATD_VERSION = 0.8.0 +SEATD_VERSION = 0.9.1 SEATD_SOURCE = $(SEATD_VERSION).tar.gz SEATD_SITE = https://git.sr.ht/~kennylevinsen/seatd/archive SEATD_LICENSE = MIT From 670c9786512655f62ca50833917a8616a1bd5829 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 9 Feb 2025 12:45:37 +0100 Subject: [PATCH 38/92] package/ffmpeg: fix armv5te build with binutils 2.43 The build error occurs since binutils 2.43 was added to buildroot with commit 800a033f7818a7799d4997aba28b9f8f5999871b Fixes: https://autobuild.buildroot.org/results/b5a/b5a782db574dfab7ae61e25291c05b1537c44c91/ Signed-off-by: Bernd Kuhls Signed-off-by: Julien Olivain --- ...lpdsp_armv5te-fix-label-format-to-wo.patch | 63 +++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 package/ffmpeg/0008-libavcodec-arm-mlpdsp_armv5te-fix-label-format-to-wo.patch diff --git a/package/ffmpeg/0008-libavcodec-arm-mlpdsp_armv5te-fix-label-format-to-wo.patch b/package/ffmpeg/0008-libavcodec-arm-mlpdsp_armv5te-fix-label-format-to-wo.patch new file mode 100644 index 0000000000..178ffbc33b --- /dev/null +++ b/package/ffmpeg/0008-libavcodec-arm-mlpdsp_armv5te-fix-label-format-to-wo.patch @@ -0,0 +1,63 @@ +From 4c688845a50f7dce3af9afebe60f0f7a493c4f07 Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Fri, 9 Aug 2024 11:32:00 +0100 +Subject: [PATCH] libavcodec/arm/mlpdsp_armv5te: fix label format to work with + binutils 2.43 +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf8 +Content-Transfer-Encoding: 8bit + +binutils 2.43 has stricter validation for labels[1] and results in errors +when building ffmpeg for armv5: + +src/libavcodec/arm/mlpdsp_armv5te.S:232: Error: junk at end of line, first unrecognized character is `0' + +Remove the leading zero in the "01" label to resolve this error. + +[1] https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=226749d5a6ff0d5c607d6428d6c81e1e7e7a994b + +Signed-off-by: Ross Burton +Signed-off-by: Martin Storsjö +(cherry picked from commit 654bd47716c4f36719fb0f3f7fd8386d5ed0b916) + +Upstream: http://git.videolan.org/?p=ffmpeg.git;a=commit;h=4c688845a50f7dce3af9afebe60f0f7a493c4f07 + +Signed-off-by: Bernd Kuhls +--- + libavcodec/arm/mlpdsp_armv5te.S | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/libavcodec/arm/mlpdsp_armv5te.S b/libavcodec/arm/mlpdsp_armv5te.S +index 4f9aa485fd..d31568611c 100644 +--- a/libavcodec/arm/mlpdsp_armv5te.S ++++ b/libavcodec/arm/mlpdsp_armv5te.S +@@ -229,7 +229,7 @@ A .endif + .endif + + // Begin loop +-01: ++1: + .if TOTAL_TAPS == 0 + // Things simplify a lot in this case + // In fact this could be pipelined further if it's worth it... +@@ -241,7 +241,7 @@ A .endif + str ST0, [PST, #-4]! + str ST0, [PST, #4 * (MAX_BLOCKSIZE + MAX_FIR_ORDER)] + str ST0, [PSAMP], #4 * MAX_CHANNELS +- bne 01b ++ bne 1b + .else + .if \fir_taps & 1 + .set LOAD_REG, 1 +@@ -333,7 +333,7 @@ T orr AC0, AC0, AC1 + str ST3, [PST, #-4]! + str ST2, [PST, #4 * (MAX_BLOCKSIZE + MAX_FIR_ORDER)] + str ST3, [PSAMP], #4 * MAX_CHANNELS +- bne 01b ++ bne 1b + .endif + b 99f + +-- +2.30.2 + From ad25dd6159217e6c9eb77f827fe2824a210a6c38 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 9 Feb 2025 12:37:43 +0100 Subject: [PATCH 39/92] package/zstd: drop useless check-package disable Commit 52154e52069d (package/zstd: build multithreaded library if supported) added an override of a previously defined variable, so an explicit check-package exception was added in 0f0e913f10ca (package/zstd: rework build and install). Eventually, in 253a951c4fe7 (package/zstd: fix build without threads) the variable override was removed. However, the check-package exception was left out during the rework in 253a951c4fe7, so it now excludes nothing. Drop this exception now. Signed-off-by: Yann E. MORIN Cc: Andrey Smirnov Signed-off-by: Julien Olivain --- package/zstd/zstd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/zstd/zstd.mk b/package/zstd/zstd.mk index 575bb2c838..bf04b4793c 100644 --- a/package/zstd/zstd.mk +++ b/package/zstd/zstd.mk @@ -72,7 +72,7 @@ else ZSTD_OPTS += HAVE_THREAD=0 ZSTD_BUILD_LIBS_THREAD_SUFFIX = -nomt endif -# check-package disable OverriddenVariable - override intended + ZSTD_BUILD_LIBS = \ $(addsuffix -release, \ $(addsuffix $(ZSTD_BUILD_LIBS_THREAD_SUFFIX), \ From e85cd58fc5af453335645b85b73e387284fc10e2 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 9 Feb 2025 13:13:55 +0100 Subject: [PATCH 40/92] package/libcurl: add upstream patch to fix Kodi segfault The error was introduced by the libcurl bump to 8.12.0 with buildroot commit 2da031c2e54cb19efae41fb666064551cfccb59e. Signed-off-by: Bernd Kuhls Signed-off-by: Julien Olivain --- ...vtsl-eliminate-data-state-ssl_scache.patch | 147 ++++++++++++++++++ 1 file changed, 147 insertions(+) create mode 100644 package/libcurl/0001-vtsl-eliminate-data-state-ssl_scache.patch diff --git a/package/libcurl/0001-vtsl-eliminate-data-state-ssl_scache.patch b/package/libcurl/0001-vtsl-eliminate-data-state-ssl_scache.patch new file mode 100644 index 0000000000..775aaa667f --- /dev/null +++ b/package/libcurl/0001-vtsl-eliminate-data-state-ssl_scache.patch @@ -0,0 +1,147 @@ +https://github.com/curl/curl/issues/16236#issuecomment-2645385845 +https://github.com/curl/curl/commit/242a1439e7d8cdb72ae6a2fa2e705e2d9a2b7501 + +Fixes curl bug https://github.com/curl/curl/issues/16236 "that caused +a segfault in kodi". + +Instead of adding upstream commit +https://github.com/curl/curl/commit/242a1439e7d8cdb72ae6a2fa2e705e2d9a2b7501 +which does not apply cleanly on libcurl 8.12.0 we use the Gentoo version: +https://github.com/gentoo/gentoo/blob/master/net-misc/curl/files/curl-8.12.0-multi.patch + +Upstream: https://github.com/curl/curl/commit/242a1439e7d8cdb72ae6a2fa2e705e2d9a2b7501 + +Signed-off-by: Bernd Kuhls + +--- a/lib/setopt.c ++++ b/lib/setopt.c +@@ -1584,10 +1584,6 @@ static CURLcode setopt_pointers(struct Curl_easy *data, CURLoption option, + if(data->share->hsts == data->hsts) + data->hsts = NULL; + #endif +-#ifdef USE_SSL +- if(data->share->ssl_scache == data->state.ssl_scache) +- data->state.ssl_scache = data->multi ? data->multi->ssl_scache : NULL; +-#endif + #ifdef USE_LIBPSL + if(data->psl == &data->share->psl) + data->psl = data->multi ? &data->multi->psl : NULL; +@@ -1628,10 +1624,6 @@ static CURLcode setopt_pointers(struct Curl_easy *data, CURLoption option, + data->hsts = data->share->hsts; + } + #endif +-#ifdef USE_SSL +- if(data->share->ssl_scache) +- data->state.ssl_scache = data->share->ssl_scache; +-#endif + #ifdef USE_LIBPSL + if(data->share->specifier & (1 << CURL_LOCK_DATA_PSL)) + data->psl = &data->share->psl; +--- a/lib/transfer.c ++++ b/lib/transfer.c +@@ -567,12 +567,6 @@ CURLcode Curl_pretransfer(struct Curl_easy *data) + #endif + data->state.httpreq = data->set.method; + +-#ifdef USE_SSL +- if(!data->state.ssl_scache) +- /* There was no ssl session cache set via a share, use the multi one */ +- data->state.ssl_scache = data->multi->ssl_scache; +-#endif +- + data->state.requests = 0; + data->state.followlocation = 0; /* reset the location-follow counter */ + data->state.this_is_a_follow = FALSE; /* reset this */ +--- a/lib/urldata.h ++++ b/lib/urldata.h +@@ -1199,7 +1199,6 @@ struct UrlState { + curl_prot_t first_remote_protocol; + + int retrycount; /* number of retries on a new connection */ +- struct Curl_ssl_scache *ssl_scache; /* TLS session pool */ + int os_errno; /* filled in with errno whenever an error occurs */ + long followlocation; /* redirect counter */ + int requests; /* request counter: redirects + authentication retakes */ +--- a/lib/vtls/vtls_scache.c ++++ b/lib/vtls/vtls_scache.c +@@ -82,6 +82,17 @@ struct Curl_ssl_scache { + long age; + }; + ++static struct Curl_ssl_scache *cf_ssl_scache_get(struct Curl_easy *data) ++{ ++ struct Curl_ssl_scache *scache = NULL; ++ /* If a share is present, its ssl_scache has preference over the multi */ ++ if(data->share && data->share->ssl_scache) ++ scache = data->share->ssl_scache; ++ else if(data->multi && data->multi->ssl_scache) ++ scache = data->multi->ssl_scache; ++ return scache; ++} ++ + static void cf_ssl_scache_clear_session(struct Curl_ssl_session *s) + { + if(s->sdata) { +@@ -792,7 +803,7 @@ CURLcode Curl_ssl_scache_put(struct Curl_cfilter *cf, + const char *ssl_peer_key, + struct Curl_ssl_session *s) + { +- struct Curl_ssl_scache *scache = data->state.ssl_scache; ++ struct Curl_ssl_scache *scache = cf_ssl_scache_get(data); + struct ssl_config_data *ssl_config = Curl_ssl_cf_get_config(cf, data); + CURLcode result; + DEBUGASSERT(ssl_config); +@@ -826,7 +837,7 @@ CURLcode Curl_ssl_scache_take(struct Curl_cfilter *cf, + const char *ssl_peer_key, + struct Curl_ssl_session **ps) + { +- struct Curl_ssl_scache *scache = data->state.ssl_scache; ++ struct Curl_ssl_scache *scache = cf_ssl_scache_get(data); + struct ssl_primary_config *conn_config = Curl_ssl_cf_get_primary_config(cf); + struct Curl_ssl_scache_peer *peer = NULL; + struct Curl_llist_node *n; +@@ -870,7 +881,7 @@ CURLcode Curl_ssl_scache_add_obj(struct Curl_cfilter *cf, + void *sobj, + Curl_ssl_scache_obj_dtor *sobj_free) + { +- struct Curl_ssl_scache *scache = data->state.ssl_scache; ++ struct Curl_ssl_scache *scache = cf_ssl_scache_get(data); + struct ssl_primary_config *conn_config = Curl_ssl_cf_get_primary_config(cf); + struct Curl_ssl_scache_peer *peer = NULL; + CURLcode result; +@@ -898,7 +909,7 @@ bool Curl_ssl_scache_get_obj(struct Curl_cfilter *cf, + const char *ssl_peer_key, + void **sobj) + { +- struct Curl_ssl_scache *scache = data->state.ssl_scache; ++ struct Curl_ssl_scache *scache = cf_ssl_scache_get(data); + struct ssl_primary_config *conn_config = Curl_ssl_cf_get_primary_config(cf); + struct Curl_ssl_scache_peer *peer = NULL; + CURLcode result; +@@ -924,7 +935,7 @@ void Curl_ssl_scache_remove_all(struct Curl_cfilter *cf, + struct Curl_easy *data, + const char *ssl_peer_key) + { +- struct Curl_ssl_scache *scache = data->state.ssl_scache; ++ struct Curl_ssl_scache *scache = cf_ssl_scache_get(data); + struct ssl_primary_config *conn_config = Curl_ssl_cf_get_primary_config(cf); + struct Curl_ssl_scache_peer *peer = NULL; + CURLcode result; +@@ -1021,7 +1032,7 @@ CURLcode Curl_ssl_session_import(struct Curl_easy *data, + const unsigned char *shmac, size_t shmac_len, + const unsigned char *sdata, size_t sdata_len) + { +- struct Curl_ssl_scache *scache = data->state.ssl_scache; ++ struct Curl_ssl_scache *scache = cf_ssl_scache_get(data); + struct Curl_ssl_scache_peer *peer = NULL; + struct Curl_ssl_session *s = NULL; + bool locked = FALSE; +@@ -1092,7 +1103,7 @@ CURLcode Curl_ssl_session_export(struct Curl_easy *data, + curl_ssls_export_cb *export_fn, + void *userptr) + { +- struct Curl_ssl_scache *scache = data->state.ssl_scache; ++ struct Curl_ssl_scache *scache = cf_ssl_scache_get(data); + struct Curl_ssl_scache_peer *peer; + struct dynbuf sbuf, hbuf; + struct Curl_llist_node *n; From c95d5b8e1eb9ee04e3e9218c63e9e7bc489e0846 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 6 Feb 2025 08:23:17 +0100 Subject: [PATCH 41/92] support/docker: move to current bookworm (Debian 12) snapshot Debian 11 is out of security support since 15 August 2024, so move to current Debian 12 instead. Signed-off-by: Peter Korsgaard --- support/docker/Dockerfile | 2 +- support/docker/apt-sources.list | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile index 6f76cd5114..baab3cadbc 100644 --- a/support/docker/Dockerfile +++ b/support/docker/Dockerfile @@ -6,7 +6,7 @@ # We use a specific tag for the base image *and* the corresponding date # for the repository., so do not forget to update the apt-sources.list # file that is shipped next to this Dockerfile. -FROM debian:bullseye-20230202 +FROM debian:bookworm-20250203 LABEL maintainer="Buildroot mailing list " \ vendor="Buildroot" \ diff --git a/support/docker/apt-sources.list b/support/docker/apt-sources.list index 849996d9f7..ddbe15eed8 100644 --- a/support/docker/apt-sources.list +++ b/support/docker/apt-sources.list @@ -1,4 +1,4 @@ -# Latest just before 20230207T102800Z: -deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20230206T092119Z/ bullseye main -deb [check-valid-until=no] http://snapshot.debian.org/archive/debian-security/20230206T092119Z/ bullseye-security main -deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20230206T092119Z/ bullseye-updates main +# Latest just before 20250205151400Z: +deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20250205T145632Z/ bookworm main +deb [check-valid-until=no] http://snapshot.debian.org/archive/debian-security/20250205T145632Z/ bookworm-security main +deb [check-valid-until=no] http://snapshot.debian.org/archive/debian/20250205T145632Z/ bookworm-updates main From f3e7e28979b407b7b9a3742977fbdaa164d12fa1 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 6 Feb 2025 08:23:18 +0100 Subject: [PATCH 42/92] support/docker: add curl Commit afece24a7272 ("support/download: introduce curl backend for FTP transfers") added curl download support, so add it to the container as well. Signed-off-by: Peter Korsgaard --- support/docker/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile index baab3cadbc..d10d0beb27 100644 --- a/support/docker/Dockerfile +++ b/support/docker/Dockerfile @@ -28,6 +28,7 @@ RUN apt-get -o APT::Retries=3 install -y --no-install-recommends \ ca-certificates \ cmake \ cpio \ + curl \ cvs \ file \ flake8 \ From 12e9fc1da5d4bc62a74dc24d24f3100e54f8cc61 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 6 Feb 2025 08:23:19 +0100 Subject: [PATCH 43/92] support/docker: add tar 1.35 Since commit b11956fb6690 ("support/dependencies: require tar >= 1.35"), Buildroot will build host-tar if the host does not have >= 1.35 available, so add it to the container to save build time. Debian 12 only provides tar 1.34. Tar 1.35 is available in testing - But that then depends on a newer glibc, so instead build it from source using the --disable-year2038 flag like we do for host-tar and install it into /usr/local/bin so it shadows the Debian one. This step runs as root (and needs to for make install), so add FORCE_UNSAFE_CONFIGURE=1 as otherwise the configure script errors out. Signed-off-by: Peter Korsgaard --- support/docker/Dockerfile | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile index d10d0beb27..8b8a478f66 100644 --- a/support/docker/Dockerfile +++ b/support/docker/Dockerfile @@ -12,6 +12,9 @@ LABEL maintainer="Buildroot mailing list " \ vendor="Buildroot" \ description="Container with everything needed to run Buildroot" +# We need tar >= 1.35 +ARG TAR_VERSION="1.35" + # Setup environment ENV DEBIAN_FRONTEND noninteractive @@ -57,6 +60,16 @@ RUN apt-get -o APT::Retries=3 install -y --no-install-recommends \ apt-get -y autoremove && \ apt-get -y clean +# Build host-tar +RUN curl -sfL https://ftpmirror.gnu.org/tar/tar-${TAR_VERSION}.tar.xz | \ + tar -Jx -C /tmp && \ + cd /tmp/tar-${TAR_VERSION} && \ + FORCE_UNSAFE_CONFIGURE=1 ./configure \ + --disable-year2028 && \ + make && \ + make install && \ + rm -rf /tmp/tar-${TAR_VERSION} + # To be able to generate a toolchain with locales, enable one UTF-8 locale RUN sed -i 's/# \(en_US.UTF-8\)/\1/' /etc/locale.gen && \ /usr/sbin/locale-gen From e5bbe020ca60789bdb0a16e27bc1a4208d8f6a5a Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 6 Feb 2025 08:23:20 +0100 Subject: [PATCH 44/92] .gitlab-ci.yml: use Debian 12-based container image with curl / tar 1.35 Signed-off-by: Peter Korsgaard --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3d7719568f..7eba876a54 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ # Configuration for Gitlab-CI. # Builds appear on https://gitlab.com/buildroot.org/buildroot/pipelines -image: $CI_REGISTRY/buildroot.org/buildroot/base:20230207.1123 +image: $CI_REGISTRY/buildroot.org/buildroot/base:20250205.1514 stages: - generate-gitlab-ci From 2c5d3a944039f0a4756dbf957d86181f24ec84e3 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 9 Feb 2025 12:50:18 +0100 Subject: [PATCH 45/92] package/kodi-pvr-iptvsimple: bump version to 21.10.2-Omega Signed-off-by: Bernd Kuhls Signed-off-by: Julien Olivain --- package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash | 2 +- package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash index d46bbbb2b5..59082d01be 100644 --- a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash +++ b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 865f70cd4843dfc0b7d2765e507696f4affc57d4afd97ec4a9382fba3f798ff1 kodi-pvr-iptvsimple-21.10.1-Omega.tar.gz +sha256 4ab62a6ee946de406fa2ae502f9e7b1c591ff6aabc2777b5c26ad5b748e2cd02 kodi-pvr-iptvsimple-21.10.2-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk index bfa9ef20a4..aa75fc5f65 100644 --- a/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk +++ b/package/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_IPTVSIMPLE_VERSION = 21.10.1-Omega +KODI_PVR_IPTVSIMPLE_VERSION = 21.10.2-Omega KODI_PVR_IPTVSIMPLE_SITE = $(call github,kodi-pvr,pvr.iptvsimple,$(KODI_PVR_IPTVSIMPLE_VERSION)) KODI_PVR_IPTVSIMPLE_LICENSE = GPL-2.0+ KODI_PVR_IPTVSIMPLE_LICENSE_FILES = LICENSE.md From dfc6aea315f2fc4169affe0bb46c22d9e4d8fa82 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Fri, 29 Nov 2024 00:59:49 +0100 Subject: [PATCH 46/92] package/fwts: bump to version 24.11.00 See release announce: https://lists.ubuntu.com/archives/fwts-devel/2024-November/013934.html Signed-off-by: Julien Olivain Signed-off-by: Romain Naour --- package/fwts/fwts.hash | 2 +- package/fwts/fwts.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/fwts/fwts.hash b/package/fwts/fwts.hash index 6c9f9dc76b..0e913b3ae8 100644 --- a/package/fwts/fwts.hash +++ b/package/fwts/fwts.hash @@ -1,5 +1,5 @@ # Hash from: https://fwts.ubuntu.com/release/SHA256SUMS -sha256 4f352dedd630217a3551bb4f6e8d61f8514be457d37b90c936c3b6cfb6a6fa7e fwts-V24.09.00.tar.gz +sha256 09dde69c6cd8e33177c37e06a9763f7d78271ad40e92f266157b739cfac8d185 fwts-V24.11.00.tar.gz # Hash for license file sha256 3cd2c5d12f024ff2aa203e37d7e972c4d5ab7bf1a65e3e09aebccf71e64b525b debian/copyright diff --git a/package/fwts/fwts.mk b/package/fwts/fwts.mk index 91b5e613dc..fded1e696b 100644 --- a/package/fwts/fwts.mk +++ b/package/fwts/fwts.mk @@ -4,7 +4,7 @@ # ################################################################################ -FWTS_VERSION = 24.09.00 +FWTS_VERSION = 24.11.00 FWTS_SOURCE = fwts-V$(FWTS_VERSION).tar.gz FWTS_SITE = https://fwts.ubuntu.com/release FWTS_STRIP_COMPONENTS = 0 From 1142a04985f45b6c733befabb97c254e387b002c Mon Sep 17 00:00:00 2001 From: Niklas Cassel Date: Mon, 10 Feb 2025 11:45:46 +0000 Subject: [PATCH 47/92] configs/rock5b: bump uboot to 2025.01 Bump uboot to 2025.01 Signed-off-by: Niklas Cassel Signed-off-by: Julien Olivain --- board/radxa/rock5b/patches/uboot/uboot.hash | 4 ++-- configs/rock5b_defconfig | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/board/radxa/rock5b/patches/uboot/uboot.hash b/board/radxa/rock5b/patches/uboot/uboot.hash index 904fa56c02..9acf6071ac 100644 --- a/board/radxa/rock5b/patches/uboot/uboot.hash +++ b/board/radxa/rock5b/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ -# Locally calculated -sha256 b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0 u-boot-2024.10.tar.bz2 +# Locally computed: +sha256 cdef7d507c93f1bbd9f015ea9bc21fa074268481405501945abc6f854d5b686f u-boot-2025.01.tar.bz2 diff --git a/configs/rock5b_defconfig b/configs/rock5b_defconfig index 47a7acc083..8a4b579e58 100644 --- a/configs/rock5b_defconfig +++ b/configs/rock5b_defconfig @@ -38,7 +38,7 @@ BR2_TARGET_ROOTFS_EXT2_SIZE="250M" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rock5b-rk3588" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="board/radxa/rock5b/u-boot.fragment" BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y From d5570b6a174800455e0737e66b687100057d9ef6 Mon Sep 17 00:00:00 2001 From: Scott Fan Date: Mon, 10 Feb 2025 10:42:43 +0800 Subject: [PATCH 48/92] package/timescaledb: bump version to 2.18.0 Release notes: https://github.com/timescale/timescaledb/blob/2.18.0/CHANGELOG.md Signed-off-by: Scott Fan Reviewed-by: Maxim Kochetkov Signed-off-by: Julien Olivain --- 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 08d981661e..f799b0c7f8 100644 --- a/package/timescaledb/timescaledb.hash +++ b/package/timescaledb/timescaledb.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 b2fcc29e9975b88c5323aefb062346326694c391d52af46186f5a5ad09136d47 timescaledb-2.17.2.tar.gz +sha256 86248970971ad075e0b5ed64dbba5b190eb8794d6e36b508427a5cc42b20a420 timescaledb-2.18.0.tar.gz sha256 0378e0948feefd85f579319c74d6e2b671194037f550c7176ef26649d94c895b LICENSE diff --git a/package/timescaledb/timescaledb.mk b/package/timescaledb/timescaledb.mk index c9dda67282..99756cb0b8 100644 --- a/package/timescaledb/timescaledb.mk +++ b/package/timescaledb/timescaledb.mk @@ -4,7 +4,7 @@ # ################################################################################ -TIMESCALEDB_VERSION = 2.17.2 +TIMESCALEDB_VERSION = 2.18.0 TIMESCALEDB_SITE = $(call github,timescale,timescaledb,$(TIMESCALEDB_VERSION)) TIMESCALEDB_LICENSE = Apache-2.0 TIMESCALEDB_LICENSE_FILES = LICENSE From 7f432324bd48ec985465810f1ba72e25c6d769f9 Mon Sep 17 00:00:00 2001 From: Michael Fischer Date: Mon, 10 Feb 2025 10:10:36 +0100 Subject: [PATCH 49/92] package/sdl2: bump version to 2.30.12 Release notes: https://github.com/libsdl-org/SDL/releases/tag/release-2.30.12 Signed-off-by: Michael Fischer Signed-off-by: Julien Olivain --- package/sdl2/sdl2.hash | 4 ++-- package/sdl2/sdl2.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sdl2/sdl2.hash b/package/sdl2/sdl2.hash index c6237d1286..9171139889 100644 --- a/package/sdl2/sdl2.hash +++ b/package/sdl2/sdl2.hash @@ -1,4 +1,4 @@ -# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.30.11.tar.gz.sig -sha256 8b8d4aef2038533da814965220f88f77d60dfa0f32685f80ead65e501337da7f SDL2-2.30.11.tar.gz +# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.30.12.tar.gz.sig +sha256 ac356ea55e8b9dd0b2d1fa27da40ef7e238267ccf9324704850d5d47375b48ea SDL2-2.30.12.tar.gz # Locally calculated sha256 97f35b302b361680ec1e891e95d2d52097bb95abff361434916d99dc1305f127 LICENSE.txt diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index 50f80c68d7..67a4978e22 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -4,7 +4,7 @@ # ################################################################################ -SDL2_VERSION = 2.30.11 +SDL2_VERSION = 2.30.12 SDL2_SOURCE = SDL2-$(SDL2_VERSION).tar.gz SDL2_SITE = http://www.libsdl.org/release SDL2_LICENSE = Zlib From 8b7982357728eeeaf7ce9992c5362bbfe429891e Mon Sep 17 00:00:00 2001 From: Thomas Perale Date: Mon, 10 Feb 2025 20:18:02 +0100 Subject: [PATCH 50/92] package/go/go-bin: re-introduce go-src hash The commit b4006287f8 "package/go: security bump to version 1.23.6" removed the go source from the go-bin package `.hash` file. Since that commit, a number of autobuild errors for the host-go-bin package started spawning during the 'legal-info' step. Because the package 'go-bin' defines the '_ACTUAL_SOURCE_TARBALL' variable the source hash is still required for the legal-info. Similarly to the 'nodejs' package, the hash files for both the `go-bin` and `go-src` package are shared in the `package/go` directory with the help of a symbolic link used to make the subdirectories point to that common `.hash` file. Fixes: https://autobuild.buildroot.org/results/337/33763441a065ddb07e944e26ad8f1f6d43b68592 Signed-off-by: Thomas Perale Signed-off-by: Romain Naour --- package/go/go-bin/go-bin.hash | 9 +-------- package/go/go-src/go-src.hash | 4 +--- package/go/go.hash | 9 +++++++++ 3 files changed, 11 insertions(+), 11 deletions(-) mode change 100644 => 120000 package/go/go-bin/go-bin.hash mode change 100644 => 120000 package/go/go-src/go-src.hash create mode 100644 package/go/go.hash diff --git a/package/go/go-bin/go-bin.hash b/package/go/go-bin/go-bin.hash deleted file mode 100644 index 50d2be239f..0000000000 --- a/package/go/go-bin/go-bin.hash +++ /dev/null @@ -1,8 +0,0 @@ -# sha256 checksum from https://go.dev/dl/ -sha256 e61f87693169c0bbcc43363128f1e929b9dff0b7f448573f1bdd4e4a0b9687ba go1.23.6.linux-386.tar.gz -sha256 9379441ea310de000f33a4dc767bd966e72ab2826270e038e78b2c53c2e7802d go1.23.6.linux-amd64.tar.gz -sha256 561c780e8f4a8955d32bf72e46af0b5ee5e0debe1e4633df9a03781878219202 go1.23.6.linux-arm64.tar.gz -sha256 27a4611010c16b8c4f37ade3aada55bd5781998f02f348b164302fd5eea4eb74 go1.23.6.linux-armv6l.tar.gz -sha256 0f817201e83d78ddbfa27f5f78d9b72450b92cc21d5e045145efacd0d3244a99 go1.23.6.linux-ppc64le.tar.gz -sha256 321e7ed0d5416f731479c52fa7610b52b8079a8061967bd48cec6d66f671a60e go1.23.6.linux-s390x.tar.gz -sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go-bin/go-bin.hash b/package/go/go-bin/go-bin.hash new file mode 120000 index 0000000000..0531a32c5c --- /dev/null +++ b/package/go/go-bin/go-bin.hash @@ -0,0 +1 @@ +../go.hash \ No newline at end of file diff --git a/package/go/go-src/go-src.hash b/package/go/go-src/go-src.hash deleted file mode 100644 index b60995fedc..0000000000 --- a/package/go/go-src/go-src.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From https://go.dev/dl -sha256 039c5b04e65279daceee8a6f71e70bd05cf5b801782b6f77c6e19e2ed0511222 go1.23.6.src.tar.gz -sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go-src/go-src.hash b/package/go/go-src/go-src.hash new file mode 120000 index 0000000000..0531a32c5c --- /dev/null +++ b/package/go/go-src/go-src.hash @@ -0,0 +1 @@ +../go.hash \ No newline at end of file diff --git a/package/go/go.hash b/package/go/go.hash new file mode 100644 index 0000000000..fd2cd71c59 --- /dev/null +++ b/package/go/go.hash @@ -0,0 +1,9 @@ +# sha256 checksum from https://go.dev/dl/ +sha256 039c5b04e65279daceee8a6f71e70bd05cf5b801782b6f77c6e19e2ed0511222 go1.23.6.src.tar.gz +sha256 e61f87693169c0bbcc43363128f1e929b9dff0b7f448573f1bdd4e4a0b9687ba go1.23.6.linux-386.tar.gz +sha256 9379441ea310de000f33a4dc767bd966e72ab2826270e038e78b2c53c2e7802d go1.23.6.linux-amd64.tar.gz +sha256 561c780e8f4a8955d32bf72e46af0b5ee5e0debe1e4633df9a03781878219202 go1.23.6.linux-arm64.tar.gz +sha256 27a4611010c16b8c4f37ade3aada55bd5781998f02f348b164302fd5eea4eb74 go1.23.6.linux-armv6l.tar.gz +sha256 0f817201e83d78ddbfa27f5f78d9b72450b92cc21d5e045145efacd0d3244a99 go1.23.6.linux-ppc64le.tar.gz +sha256 321e7ed0d5416f731479c52fa7610b52b8079a8061967bd48cec6d66f671a60e go1.23.6.linux-s390x.tar.gz +sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE From 8ab0849575b5b45003472ec105accac2af256a3b Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Mon, 10 Feb 2025 21:05:16 +0100 Subject: [PATCH 51/92] package/fwts: bump to version 25.01.00 See release announce: https://lists.ubuntu.com/archives/fwts-devel/2025-January/013954.html This commit also updates the license hash, due to year update in: https://github.com/fwts/fwts/commit/b6bd85fc8da14c1279de186eb12b7e58ecf7812d Signed-off-by: Julien Olivain Signed-off-by: Romain Naour --- package/fwts/fwts.hash | 4 ++-- package/fwts/fwts.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/fwts/fwts.hash b/package/fwts/fwts.hash index 0e913b3ae8..97b13b3db0 100644 --- a/package/fwts/fwts.hash +++ b/package/fwts/fwts.hash @@ -1,5 +1,5 @@ # Hash from: https://fwts.ubuntu.com/release/SHA256SUMS -sha256 09dde69c6cd8e33177c37e06a9763f7d78271ad40e92f266157b739cfac8d185 fwts-V24.11.00.tar.gz +sha256 c8bbf62f4bd80f17bb768bab3863ee93e195b2047d10637a3d03fe2086291bd7 fwts-V25.01.00.tar.gz # Hash for license file -sha256 3cd2c5d12f024ff2aa203e37d7e972c4d5ab7bf1a65e3e09aebccf71e64b525b debian/copyright +sha256 77a5f0ea48e53ee8d67aecc7759cf468bcd340c1caca711ed4307b477a93fb47 debian/copyright diff --git a/package/fwts/fwts.mk b/package/fwts/fwts.mk index fded1e696b..410ce063aa 100644 --- a/package/fwts/fwts.mk +++ b/package/fwts/fwts.mk @@ -4,7 +4,7 @@ # ################################################################################ -FWTS_VERSION = 24.11.00 +FWTS_VERSION = 25.01.00 FWTS_SOURCE = fwts-V$(FWTS_VERSION).tar.gz FWTS_SITE = https://fwts.ubuntu.com/release FWTS_STRIP_COMPONENTS = 0 From a310884588fb629dc7d6d4a80440cadc05d87054 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Mon, 10 Feb 2025 12:21:09 +0200 Subject: [PATCH 52/92] package/libwpe: bump to version 1.16.2 This minor release brings in support for analog gamepad/joystick inputs. Version 1.16.1 was deliberately skipped because it introduced accidental ABI breakage, which was fixed in 1.16.2. Release notes: https://wpewebkit.org/release/libwpe-1.16.1.html https://wpewebkit.org/release/libwpe-1.16.2.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Julien Olivain --- package/libwpe/libwpe.hash | 8 ++++---- package/libwpe/libwpe.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/libwpe/libwpe.hash b/package/libwpe/libwpe.hash index 2a2ee3c2e9..45bba04d35 100644 --- a/package/libwpe/libwpe.hash +++ b/package/libwpe/libwpe.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/libwpe-1.16.0.tar.xz.sums -md5 9779115aaa7e67abe642777394e7bfa2 libwpe-1.16.0.tar.xz -sha1 ea574e09b5d47461a5579a24006488419474d136 libwpe-1.16.0.tar.xz -sha256 c7f3a3c6b3d006790d486dc7cceda2b6d2e329de07f33bc47dfc53f00f334b2a libwpe-1.16.0.tar.xz +# From https://wpewebkit.org/releases/libwpe-1.16.2.tar.xz.sums +md5 689306c9baf6f8d6844146a5c84fc932 libwpe-1.16.2.tar.xz +sha1 499b62ddd3c1becaffc3b344ff5131c37d527144 libwpe-1.16.2.tar.xz +sha256 960bdd11c3f2cf5bd91569603ed6d2aa42fd4000ed7cac930a804eac367888d7 libwpe-1.16.2.tar.xz # Hashes for license files: sha256 35bef295cedbbf179eaee14328002587a0e7dc08ebf3f15ea080a6f2815f0d7b COPYING diff --git a/package/libwpe/libwpe.mk b/package/libwpe/libwpe.mk index de49cedfb4..5721b83784 100644 --- a/package/libwpe/libwpe.mk +++ b/package/libwpe/libwpe.mk @@ -5,7 +5,7 @@ ################################################################################ # The middle number is even for stable releases, odd for development ones. -LIBWPE_VERSION = 1.16.0 +LIBWPE_VERSION = 1.16.2 LIBWPE_SITE = https://wpewebkit.org/releases LIBWPE_SOURCE = libwpe-$(LIBWPE_VERSION).tar.xz LIBWPE_INSTALL_STAGING = YES From 915ee667ae7d448b6a5d3145b43404d7ce5faecf Mon Sep 17 00:00:00 2001 From: Thomas Bonnefille Date: Wed, 5 Feb 2025 13:13:52 +0100 Subject: [PATCH 53/92] package/mimic: remove the mimic package The mimic package hasn't been updated in recent years and downloading this package is now broken. This commit removes the mimic package. Signed-off-by: Thomas Bonnefille Signed-off-by: Peter Korsgaard --- .checkpackageignore | 1 - Config.in.legacy | 6 +++ DEVELOPERS | 1 - package/Config.in | 1 - ...1-Fix-linking-on-gcc-10.2.0-or-newer.patch | 27 ------------ package/mimic/Config.in | 41 ------------------- package/mimic/mimic.hash | 3 -- package/mimic/mimic.mk | 29 ------------- 8 files changed, 6 insertions(+), 103 deletions(-) delete mode 100644 package/mimic/0001-Fix-linking-on-gcc-10.2.0-or-newer.patch delete mode 100644 package/mimic/Config.in delete mode 100644 package/mimic/mimic.hash delete mode 100644 package/mimic/mimic.mk diff --git a/.checkpackageignore b/.checkpackageignore index ba07cb94f9..ed29682bb7 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -821,7 +821,6 @@ package/metacity/0002-gconf.patch lib_patch.Upstream package/metacity/0003-mag-add-libm-reference.patch lib_patch.Upstream package/mfgtools/0001-lnx_def.h-fix-conflicting-declaration-of-__time64_t.patch lib_patch.Upstream package/mii-diag/0001-strchr.patch lib_patch.Sob lib_patch.Upstream -package/mimic/0001-Fix-linking-on-gcc-10.2.0-or-newer.patch lib_patch.Upstream package/mini-snmpd/0001-linux.c-fix-musl-build.patch lib_patch.Upstream package/minidlna/S60minidlnad Shellcheck lib_sysv.Indent lib_sysv.Variables package/minissdpd/S50minissdpd Shellcheck lib_sysv.Indent lib_sysv.Variables diff --git a/Config.in.legacy b/Config.in.legacy index 214d351e4a..c302b73423 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -231,6 +231,12 @@ config BR2_PACKAGE_GST_OMX The gst-omx module has been removed from Gstreamer in release 1.24 in favor of Video4Linux-based video encoders. +config BR2_PACKAGE_MIMIC + bool "mimic has been removed" + select BR2_LEGACY + help + The mimic package has been removed from Buildroot. + config BR2_PACKAGE_SDL2_DIRECTFB bool "sdl2 directfb support removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 837fa93f4d..5f98257b86 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -966,7 +966,6 @@ F: configs/ci20_defconfig F: package/fio/ F: package/iptraf-ng/ F: package/jimtcl/ -F: package/mimic/ F: package/nodm/ F: package/openbox/ F: package/supertuxkart/ diff --git a/package/Config.in b/package/Config.in index 3153fd6afa..dac1fc568d 100644 --- a/package/Config.in +++ b/package/Config.in @@ -31,7 +31,6 @@ menu "Audio and video applications" source "package/kodi/Config.in" source "package/lame/Config.in" source "package/madplay/Config.in" - source "package/mimic/Config.in" source "package/minimodem/Config.in" source "package/miraclecast/Config.in" source "package/mjpegtools/Config.in" diff --git a/package/mimic/0001-Fix-linking-on-gcc-10.2.0-or-newer.patch b/package/mimic/0001-Fix-linking-on-gcc-10.2.0-or-newer.patch deleted file mode 100644 index ea02bf587e..0000000000 --- a/package/mimic/0001-Fix-linking-on-gcc-10.2.0-or-newer.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 77b36eaeb2c38eba571b8db7e9bb0fd507774e6d Mon Sep 17 00:00:00 2001 -From: Kris Gesling -Date: Tue, 11 May 2021 09:15:22 +0930 -Subject: [PATCH] Fix linking on gcc 10.2.0 or newer - -Co-authored-by: MichaelSabal - -[Retrieved from: -https://github.com/MycroftAI/mimic1/commit/77b36eaeb2c38eba571b8db7e9bb0fd507774e6d] -Signed-off-by: Fabrice Fontaine ---- - lang/cmu_indic_lang/cmu_indic_lang.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lang/cmu_indic_lang/cmu_indic_lang.h b/lang/cmu_indic_lang/cmu_indic_lang.h -index 75ee46c..83e2afa 100644 ---- a/lang/cmu_indic_lang/cmu_indic_lang.h -+++ b/lang/cmu_indic_lang/cmu_indic_lang.h -@@ -51,7 +51,7 @@ void cmu_indic_lang_init(cst_voice *v); - extern const cst_phoneset cmu_indic_phoneset; - extern const cst_cart cmu_indic_phrasing_cart; - --const cst_regex * const cst_rx_not_indic; -+extern const cst_regex * const cst_rx_not_indic; - - #ifdef __cplusplus - } /* extern "C" */ diff --git a/package/mimic/Config.in b/package/mimic/Config.in deleted file mode 100644 index 79641d3790..0000000000 --- a/package/mimic/Config.in +++ /dev/null @@ -1,41 +0,0 @@ -comment "mimic needs a toolchain w/ wchar" - depends on !BR2_USE_WCHAR - -config BR2_PACKAGE_MIMIC - bool "mimic" - depends on BR2_USE_WCHAR - help - Mimic is a fast, lightweight Text-to-speech engine developed - by Mycroft A.I. and VocaliD, based on Carnegie Mellon - University's Flite (Festival-Lite) software. Mimic takes in - text and reads it out loud to create a high quality voice. - - https://github.com/MycroftAI/mimic - -if BR2_PACKAGE_MIMIC - -choice - prompt "audio backend" - default BR2_PACKAGE_MIMIC_AUDIO_BACKEND_NONE - -config BR2_PACKAGE_MIMIC_AUDIO_BACKEND_NONE - bool "none" - help - With no backend, mimic will only be able to produce .wav - files. - -config BR2_PACKAGE_MIMIC_AUDIO_BACKEND_ALSA - bool "alsa" - depends on BR2_PACKAGE_ALSA_LIB - -config BR2_PACKAGE_MIMIC_AUDIO_BACKEND_PORTAUDIO - bool "alsa via portaudio" - depends on BR2_PACKAGE_PORTAUDIO - -config BR2_PACKAGE_MIMIC_AUDIO_BACKEND_PULSEAUDIO - bool "pulseaudio" - depends on BR2_PACKAGE_PULSEAUDIO - -endchoice - -endif # BR2_PACKAGE_MIMIC diff --git a/package/mimic/mimic.hash b/package/mimic/mimic.hash deleted file mode 100644 index 10780d415d..0000000000 --- a/package/mimic/mimic.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 725003c9972d5b67c49d5ea6a89cb26b63414ff2c7adbbaf9200cf9eb55f80eb mimic-1.1.0.tar.gz -sha256 c423c1c6d260091d80ee4c00f386a10fea39963a3f1530f2c245f15dd20324ee COPYING diff --git a/package/mimic/mimic.mk b/package/mimic/mimic.mk deleted file mode 100644 index 2d246561c9..0000000000 --- a/package/mimic/mimic.mk +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# -# mimic -# -################################################################################ - -MIMIC_VERSION = 1.1.0 -MIMIC_SITE = $(call github,MycroftAI,mimic,$(MIMIC_VERSION)) -MIMIC_LICENSE = MIT -MIMIC_LICENSE_FILES = COPYING - -MIMIC_DEPENDENCIES = host-pkgconf - -ifeq ($(BR2_PACKAGE_MIMIC_AUDIO_BACKEND_ALSA),y) -MIMIC_AUDIO_BACKEND = alsa -MIMIC_DEPENDENCIES += alsa-lib -else ifeq ($(BR2_PACKAGE_MIMIC_AUDIO_BACKEND_PORTAUDIO),y) -MIMIC_AUDIO_BACKEND = portaudio -MIMIC_DEPENDENCIES += portaudio -else ifeq ($(BR2_PACKAGE_MIMIC_AUDIO_BACKEND_PULSEAUDIO),y) -MIMIC_AUDIO_BACKEND = pulseaudio -MIMIC_DEPENDENCIES += pulseaudio -else ifeq ($(BR2_PACKAGE_MIMIC_AUDIO_BACKEND_NONE),y) -MIMIC_AUDIO_BACKEND = none -endif - -MIMIC_CONF_OPTS += --with-audio=$(MIMIC_AUDIO_BACKEND) - -$(eval $(autotools-package)) From db85638cea3414ca0293cbbb2352e5b0b63a2579 Mon Sep 17 00:00:00 2001 From: Scott Fan Date: Mon, 10 Feb 2025 10:26:38 +0800 Subject: [PATCH 54/92] package/sqlite: bump version to 3.49.0 Release notes: https://www.sqlite.org/releaselog/3_49_0.html Signed-off-by: Scott Fan Signed-off-by: Peter Korsgaard --- package/sqlite/sqlite.hash | 2 +- package/sqlite/sqlite.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/sqlite/sqlite.hash b/package/sqlite/sqlite.hash index 5b933fba8f..ddec2637b8 100644 --- a/package/sqlite/sqlite.hash +++ b/package/sqlite/sqlite.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 ac992f7fca3989de7ed1fe99c16363f848794c8c32a158dafd4eb927a2e02fd5 sqlite-autoconf-3480000.tar.gz +sha256 4d8bfa0b55e36951f6e5a9fb8c99f3b58990ab785c57b4f84f37d163a0672759 sqlite-autoconf-3490000.tar.gz sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 tea/license.terms diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk index c8f12a427a..a23f6e1d66 100644 --- a/package/sqlite/sqlite.mk +++ b/package/sqlite/sqlite.mk @@ -4,8 +4,8 @@ # ################################################################################ -SQLITE_VERSION = 3.48.0 -SQLITE_TAR_VERSION = 3480000 +SQLITE_VERSION = 3.49.0 +SQLITE_TAR_VERSION = 3490000 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_TAR_VERSION).tar.gz SQLITE_SITE = https://www.sqlite.org/2025 SQLITE_LICENSE = blessing From e11413a23e8498106dc984c79df473ba47a708b0 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 11 Feb 2025 17:37:48 +0100 Subject: [PATCH 55/92] package/libopenssl: security bump to version 3.4.1 Fixes the following security issues: CVE-2024-13176: Timing side-channel in ECDSA signature computation https://openssl-library.org/news/vulnerabilities/index.html#CVE-2024-13176 CVE-2024-12797: RFC7250 handshakes with unauthenticated servers don't abort as expected https://openssl-library.org/news/vulnerabilities/index.html#CVE-2024-12797 Signed-off-by: Peter Korsgaard Signed-off-by: Julien Olivain --- package/libopenssl/libopenssl.hash | 4 ++-- package/libopenssl/libopenssl.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libopenssl/libopenssl.hash b/package/libopenssl/libopenssl.hash index dad30da34e..5924c5d46a 100644 --- a/package/libopenssl/libopenssl.hash +++ b/package/libopenssl/libopenssl.hash @@ -1,5 +1,5 @@ -# From https://github.com/openssl/openssl/releases/download/openssl-3.4.0/openssl-3.4.0.tar.gz.sha256 -sha256 e15dda82fe2fe8139dc2ac21a36d4ca01d5313c75f99f46c4e8a27709b7294bf openssl-3.4.0.tar.gz +# From https://github.com/openssl/openssl/releases/download/openssl-3.4.1/openssl-3.4.1.tar.gz.sha256 +sha256 002a2d6b30b58bf4bea46c43bdd96365aaf8daa6c428782aa4feee06da197df3 openssl-3.4.1.tar.gz # License files sha256 7d5450cb2d142651b8afa315b5f238efc805dad827d91ba367d8516bc9d49e7a LICENSE.txt diff --git a/package/libopenssl/libopenssl.mk b/package/libopenssl/libopenssl.mk index 6a59cb2ff0..c1c5b818d7 100644 --- a/package/libopenssl/libopenssl.mk +++ b/package/libopenssl/libopenssl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBOPENSSL_VERSION = 3.4.0 +LIBOPENSSL_VERSION = 3.4.1 LIBOPENSSL_SITE = https://github.com/openssl/openssl/releases/download/openssl-$(LIBOPENSSL_VERSION) LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz LIBOPENSSL_LICENSE = Apache-2.0 From abd20d7a27fb2fc0a7bd9d8ccd515485da742133 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 11 Feb 2025 21:35:34 +0100 Subject: [PATCH 56/92] package/ffmpeg: add optional support for libxml2 Support for libxml2 was added 2017 in ffmpeg version 3.4: http://git.videolan.org/?p=ffmpeg.git;a=commit;h=96d70694aea64616c68db8be306c159c73fb3980 Signed-off-by: Bernd Kuhls Signed-off-by: Julien Olivain --- package/ffmpeg/ffmpeg.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index 1b6b9e7693..93870b0470 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -383,6 +383,13 @@ else FFMPEG_CONF_OPTS += --disable-iconv endif +ifeq ($(BR2_PACKAGE_LIBXML2),y) +FFMPEG_CONF_OPTS += --enable-libxml2 +FFMPEG_DEPENDENCIES += libxml2 +else +FFMPEG_CONF_OPTS += --disable-libxml2 +endif + # ffmpeg freetype support require fenv.h which is only # available/working on glibc. # The microblaze variant doesn't provide the needed exceptions From 3bc94471ca8a90f331366d9593630952b0e7bb10 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Mon, 10 Feb 2025 21:57:16 +0100 Subject: [PATCH 57/92] support/docker: prepare for Aarch64 Docker images With the new 'buildx' command using 'BuildKit' since Docker 23.0 [1], it become easy to build the same image for several architectures [2]. The only requirement is to use a Dockerfile without any architecture specific definition. Since our current Dockefile contains already some i386 specific packages (g++-multilib,libc6:i386) to provide x86 32bits support, we have to install them conditionally. Update the build process described in the Dockerfile accordingly. For now, Aarch64 hosts can't be used by the Buildroot testsuite (yet) since the Bootlin external toolchain (used by default) currently only support x86_64 hosts. [1] https://docs.docker.com/engine/release-notes/23.0/ [2] https://www.docker.com/blog/multi-arch-build-and-images-the-simple-way/ [3] https://www.docker.com/blog/multi-arch-build-what-about-gitlab-ci/ Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- support/docker/Dockerfile | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile index 8b8a478f66..93044eb7fd 100644 --- a/support/docker/Dockerfile +++ b/support/docker/Dockerfile @@ -1,7 +1,9 @@ # This Dockerfile generates the docker image that gets used by Gitlab CI -# To build it (YYYYMMDD.HHMM is the current date and time in UTC): -# docker build -t registry.gitlab.com/buildroot.org/buildroot/base:YYYYMMDD.HHMM support/docker -# docker push registry.gitlab.com/buildroot.org/buildroot/base:YYYYMMDD.HHMM +# To build it for arm64 and amd64 (YYYYMMDD.HHMM is the current date and time in UTC): +# docker buildx create --use +# docker buildx build --platform linux/amd64,linux/arm64/v8 \ +# -t registry.gitlab.com/buildroot.org/buildroot/base:YYYYMMDD.HHMM \ +# --push support/docker # We use a specific tag for the base image *and* the corresponding date # for the repository., so do not forget to update the apt-sources.list @@ -21,9 +23,20 @@ ENV DEBIAN_FRONTEND noninteractive # This repository can be a bit slow at times. Don't panic... COPY apt-sources.list /etc/apt/sources.list +# Install 32bit variant on x86_64 image. +RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \ + dpkg --add-architecture i386; \ +fi + # The container has no package lists, so need to update first -RUN dpkg --add-architecture i386 && \ - apt-get -o APT::Retries=3 update -y +RUN apt-get -o APT::Retries=3 update -y + +RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \ + apt-get -o APT::Retries=3 install -y --no-install-recommends \ + g++-multilib \ + libc6:i386; \ +fi + RUN apt-get -o APT::Retries=3 install -y --no-install-recommends \ bc \ build-essential \ @@ -35,9 +48,8 @@ RUN apt-get -o APT::Retries=3 install -y --no-install-recommends \ cvs \ file \ flake8 \ - g++-multilib \ + g++ \ git \ - libc6:i386 \ libncurses5-dev \ locales \ mercurial \ From 03b0379426518d50650bbcfaeaff6836ec8e3d8d Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 12 Feb 2025 11:24:30 +0100 Subject: [PATCH 58/92] support/docker/Dockerfile: use correct ENV syntax buildx correctly complains about our ENV lines: 3 warnings found (use docker --debug to expand): - LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format (line 21) - LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format (line 94) - LegacyKeyValueFormat: "ENV key=value" should be used instead of legacy "ENV key value" format (line 95) The ENV syntax is defined as ENV FOO=BAR, not ENV FOO BAR, so adjust the Dockerfile to match to get rid of this warning. https://docs.docker.com/reference/dockerfile/#env Signed-off-by: Peter Korsgaard --- support/docker/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile index 93044eb7fd..d0bdc73bbf 100644 --- a/support/docker/Dockerfile +++ b/support/docker/Dockerfile @@ -18,7 +18,7 @@ description="Container with everything needed to run Buildroot" ARG TAR_VERSION="1.35" # Setup environment -ENV DEBIAN_FRONTEND noninteractive +ENV DEBIAN_FRONTEND=noninteractive # This repository can be a bit slow at times. Don't panic... COPY apt-sources.list /etc/apt/sources.list @@ -91,5 +91,5 @@ RUN useradd -ms /bin/bash br-user && \ USER br-user WORKDIR /home/br-user -ENV HOME /home/br-user -ENV LC_ALL en_US.UTF-8 +ENV HOME=/home/br-user +ENV LC_ALL=en_US.UTF-8 From a7a18c2ef8d654a34d31eb5cc146acdcc4b2029f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 12 Feb 2025 16:48:53 +0100 Subject: [PATCH 59/92] package/nginx: security update to 1.26.3 See here for a changelog: http://nginx.org/en/CHANGES-1.26 Fixes the following security issue: CVE-2025-23419: Security: insufficient check in virtual servers handling with TLSv1.3 SNI allowed to reuse SSL sessions in a different virtual server, to bypass client SSL certificates verification https://www.cve.org/CVERecord?id=CVE-2025-23419 Signed-off-by: Waldemar Brodkorb Signed-off-by: Peter Korsgaard --- package/nginx/nginx.hash | 2 +- package/nginx/nginx.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/nginx/nginx.hash b/package/nginx/nginx.hash index 4cf859dadc..77220665f3 100644 --- a/package/nginx/nginx.hash +++ b/package/nginx/nginx.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -sha256 627fe086209bba80a2853a0add9d958d7ebbdffa1a8467a5784c9a6b4f03d738 nginx-1.26.2.tar.gz +sha256 69ee2b237744036e61d24b836668aad3040dda461fe6f570f1787eab570c75aa nginx-1.26.3.tar.gz # License files, locally calculated sha256 f19c4caea60247490199c5a6d0134281e3fb20b3d7577e6873c628597f5381d9 LICENSE diff --git a/package/nginx/nginx.mk b/package/nginx/nginx.mk index 7a5455def7..6ca1ac2075 100644 --- a/package/nginx/nginx.mk +++ b/package/nginx/nginx.mk @@ -4,7 +4,7 @@ # ################################################################################ -NGINX_VERSION = 1.26.2 +NGINX_VERSION = 1.26.3 NGINX_SITE = https://nginx.org/download NGINX_LICENSE = BSD-2-Clause NGINX_LICENSE_FILES = LICENSE From 3e02851ed0ae58ca4278065cd1039cb15de8a3dd Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Sat, 8 Aug 2020 08:50:39 -0700 Subject: [PATCH 60/92] github: setup CI workflow configurations automated build + check-package + legal-info. Signed-off-by: Christian Stewart --- .github/workflows/buildroot-e2e.yml | 65 +++++++++++++++++++++++ .github/workflows/buildroot-e2e_defconfig | 21 ++++++++ 2 files changed, 86 insertions(+) create mode 100644 .github/workflows/buildroot-e2e.yml create mode 100644 .github/workflows/buildroot-e2e_defconfig diff --git a/.github/workflows/buildroot-e2e.yml b/.github/workflows/buildroot-e2e.yml new file mode 100644 index 0000000000..19f7bf7ef6 --- /dev/null +++ b/.github/workflows/buildroot-e2e.yml @@ -0,0 +1,65 @@ +name: CI + +# Controls when the action will run. +on: + push: + branches: [master, skiff, skiff-next] + pull_request: + branches: [skiff, skiff-next, upstream-master] + +# A workflow run is made up of one or more jobs that can run sequentially or in parallel +jobs: + # This workflow contains a single job called "build" + build: + # The type of runner that the job will run on + runs-on: ubuntu-latest + + env: + # for add-env below + ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true' + + # Steps represent a sequence of tasks + steps: + # Checks-out the repo under $GITHUB_WORKSPACE + - uses: actions/checkout@v2 + + - name: Cache build cache and downloads + uses: actions/cache@v2 + env: + cache-name: cache-buildroot + with: + path: ~/br-cache/ + key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('Makefile') }} + restore-keys: | + ${{ runner.os }}-build-${{ env.cache-name }}- + ${{ runner.os }}-build- + ${{ runner.os }}- + + # Detect changes vs upstream-master + - name: Detect changes vs upstream + run: | + cd $GITHUB_WORKSPACE + git fetch + git remote add upstream https://github.com/buildroot/buildroot.git + git fetch upstream + export BUILDROOT_UPSTREAM=$(cat .github/buildroot-upstream) + echo "::set-env name=CHANGED_VS_UPSTREAM::$(git diff --diff-filter=ACM --name-only $BUILDROOT_UPSTREAM | xargs)" + + # Installing buildroot deps + - name: Install buildroot apt deps + run: | + sudo apt-get install -y libelf-dev python3-magic python3-flake8 + + # Run check-package on changed files + - name: Run check-package on all changed files and setup env + run: | + cd $GITHUB_WORKSPACE + ./utils/check-package $CHANGED_VS_UPSTREAM + + # Test a build + - name: Run a generic build + run: | + cd $GITHUB_WORKSPACE + make defconfig BR2_DEFCONFIG=$(pwd)/.github/workflows/buildroot-e2e_defconfig + make -s all legal-info BR2_CCACHE_DIR=${HOME}/br-cache/ccache BR2_DL_DIR=${HOME}/br-cache/dl + diff --git a/.github/workflows/buildroot-e2e_defconfig b/.github/workflows/buildroot-e2e_defconfig new file mode 100644 index 0000000000..e4dcd411e6 --- /dev/null +++ b/.github/workflows/buildroot-e2e_defconfig @@ -0,0 +1,21 @@ +BR2_x86_64=y +BR2_x86_core_avx2=y +BR2_CCACHE=y +BR2_TOOLCHAIN_BUILDROOT_GLIBC=y +BR2_TOOLCHAIN_BUILDROOT_CXX=y +BR2_GCC_ENABLE_LTO=n +BR2_INIT_SYSTEMD=y +# BR2_TARGET_ENABLE_ROOT_LOGIN is not set +BR2_SYSTEM_BIN_SH_BASH=y +BR2_ENABLE_LOCALE_WHITELIST="C en_US en_US.UTF-8" +BR2_GENERATE_LOCALE="en_US.UTF-8" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_DEFCONFIG="x86_64" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_PACKAGE_CA_CERTIFICATES=y +BR2_PACKAGE_DELVE=y +BR2_PACKAGE_DOCKER_CLI=y +BR2_PACKAGE_DOCKER_CLI_STATIC=y +BR2_PACKAGE_DOCKER_ENGINE_EXPERIMENTAL=y +BR2_PACKAGE_MENDER=y +BR2_PACKAGE_HOST_MENDER_ARTIFACT=y From bdf32cc826fa617671e7461dc93ffc35f50000b9 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Thu, 20 Aug 2020 16:12:01 -0700 Subject: [PATCH 61/92] .github: add per-branch upstream file Signed-off-by: Christian Stewart --- .github/buildroot-upstream | 1 + 1 file changed, 1 insertion(+) create mode 100644 .github/buildroot-upstream diff --git a/.github/buildroot-upstream b/.github/buildroot-upstream new file mode 100644 index 0000000000..9c9ac90463 --- /dev/null +++ b/.github/buildroot-upstream @@ -0,0 +1 @@ +upstream/master From bbcb4c1a17ff7e30368855d22be68f50e90010c4 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Mon, 30 Jan 2023 15:24:21 -0800 Subject: [PATCH 62/92] [SKIFF] download: add additional skiffos mirror site Signed-off-by: Christian Stewart --- Config.in | 10 ++++++++++ package/pkg-download.mk | 4 ++++ 2 files changed, 14 insertions(+) diff --git a/Config.in b/Config.in index a543091d4f..1970a0db24 100644 --- a/Config.in +++ b/Config.in @@ -277,6 +277,16 @@ config BR2_BACKUP_SITE buildroot will fall back to download package sources from here if the normal location fails. +config BR2_SKIFFOS_BACKUP_SITE + string "SkiffOS backup download site" + default "https://github.com/skiffos/mirror/raw/master" + help + Backup site to download from. If this option is set then + buildroot will fall back to download package sources from here + if the normal location fails. + + This is an additional mirror used by SkiffOS. + config BR2_KERNEL_MIRROR string "Kernel.org mirror" default "https://cdn.kernel.org/pub" diff --git a/package/pkg-download.mk b/package/pkg-download.mk index ca01ff67a5..99a38ccb0d 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -96,6 +96,10 @@ DOWNLOAD_URIS += \ $(call getschemeplusuri,$(call qstrip,$(BR2_BACKUP_SITE)/$($(2)_DL_SUBDIR)),urlencode) \ $(call getschemeplusuri,$(call qstrip,$(BR2_BACKUP_SITE)),urlencode) endif +ifneq ($(call qstrip,$(BR2_SKIFFOS_BACKUP_SITE)),) +DOWNLOAD_URIS += \ + $(call getschemeplusuri,$(call qstrip,$(BR2_SKIFFOS_BACKUP_SITE)/$($(2)_DL_SUBDIR)),urlencode) +endif endif ################################################################################ From 75b1333035fbb367c3e850f4e9f344b0848b7560 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Mon, 2 Oct 2023 12:20:33 -0700 Subject: [PATCH 63/92] [SKIFF] package/amlogic-boot-fip: copy device directory to images Signed-off-by: Christian Stewart --- package/amlogic-boot-fip/Config.in.host | 7 +++++-- package/amlogic-boot-fip/amlogic-boot-fip.mk | 11 ++--------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/package/amlogic-boot-fip/Config.in.host b/package/amlogic-boot-fip/Config.in.host index bccc6296d1..684c071388 100644 --- a/package/amlogic-boot-fip/Config.in.host +++ b/package/amlogic-boot-fip/Config.in.host @@ -1,11 +1,12 @@ config BR2_PACKAGE_HOST_AMLOGIC_BOOT_FIP bool "host amlogic-boot-fip" - depends on BR2_HOSTARCH = "x86_64" help Firmware Image Package (FIP) sources used to sign Amlogic u-boot binaries in LibreELEC images - https://github.com/LibreELEC/amlogic-boot-fip + https://gitlab.com/LibreELEC/amlogic-boot-fip + +if BR2_PACKAGE_HOST_AMLOGIC_BOOT_FIP config BR2_PACKAGE_HOST_AMLOGIC_BOOT_FIP_DEVICE string "fip device" @@ -15,3 +16,5 @@ config BR2_PACKAGE_HOST_AMLOGIC_BOOT_FIP_DEVICE Device for which you want to use this package. See the list of supported SoCs: https://github.com/LibreELEC/amlogic-boot-fip + +endif # BR2_PACKAGE_HOST_AMLOGIC_BOOT_FIP diff --git a/package/amlogic-boot-fip/amlogic-boot-fip.mk b/package/amlogic-boot-fip/amlogic-boot-fip.mk index f98887cfcd..2c7934f7ec 100644 --- a/package/amlogic-boot-fip/amlogic-boot-fip.mk +++ b/package/amlogic-boot-fip/amlogic-boot-fip.mk @@ -11,22 +11,15 @@ AMLOGIC_BOOT_FIP_LICENSE_FILES = LICENSE AMLOGIC_BOOT_FIP_REDISTRIBUTE = NO AMLOGIC_BOOT_FIP_INSTALL_DIR = $(BINARIES_DIR)/amlogic-boot-fip - AMLOGIC_BOOT_FIP_DEVICE = $(call qstrip,$(BR2_PACKAGE_HOST_AMLOGIC_BOOT_FIP_DEVICE)) -AMLOGIC_BOOT_FIP_FILES_TO_INSTALL = build-fip.sh axg.inc g12a.inc gxbb.inc gxl.inc - define HOST_AMLOGIC_BOOT_FIP_INSTALL_CMDS - mkdir -p $(AMLOGIC_BOOT_FIP_INSTALL_DIR)/$(AMLOGIC_BOOT_FIP_DEVICE) - $(foreach f,$(AMLOGIC_BOOT_FIP_FILES_TO_INSTALL),\ - $(INSTALL) -D -m 0755 $(@D)/$(f) $(AMLOGIC_BOOT_FIP_INSTALL_DIR)/$(f) - ) - cp -rf $(@D)/$(AMLOGIC_BOOT_FIP_DEVICE) $(AMLOGIC_BOOT_FIP_INSTALL_DIR) + cp -dpfr $(@D)/$(AMLOGIC_BOOT_FIP_DEVICE)/. $(AMLOGIC_BOOT_FIP_INSTALL_DIR)/ endef # check for empty device string when we're building ifeq ($(BR2_PACKAGE_HOST_AMLOGIC_BOOT_FIP)$(BR_BUILDING),yy) -ifeq ($(call qstrip,$(BR2_PACKAGE_HOST_AMLOGIC_BOOT_FIP_DEVICE)),) +ifeq ($(AMLOGIC_BOOT_FIP_DEVICE),) $(error No device specified for amlogic-boot-fip, please check your BR2_PACKAGE_HOST_AMLOGIC_BOOT_FIP_DEVICE setting) endif endif From 0fcb51b6e1f937f6c0bd952d7bda6b693c5228b9 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Sun, 2 Jul 2023 19:56:44 -0700 Subject: [PATCH 64/92] [SKIFF] package/openvpn: add option to disable DCO features Add option to avoid build failures on older kernels. Signed-off-by: Christian Stewart --- package/openvpn/Config.in | 6 ++++++ package/openvpn/openvpn.mk | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/package/openvpn/Config.in b/package/openvpn/Config.in index 77afc9eaf4..5b66fb310a 100644 --- a/package/openvpn/Config.in +++ b/package/openvpn/Config.in @@ -37,4 +37,10 @@ config BR2_PACKAGE_OPENVPN_SMALL You loose eurephia, debugging info, help messages and more. It saves around 100 KiB in binary file size. +config BR2_PACKAGE_OPENVPN_DCO + bool "Enable DCO" + default y + help + Enable DCO feature in OpenVPN + endif diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index e484a4e80f..6833c64607 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -16,7 +16,7 @@ OPENVPN_CONF_OPTS = \ $(if $(BR2_STATIC_LIBS),--disable-plugins) OPENVPN_CONF_ENV = NETSTAT=/bin/netstat -ifeq ($(BR2_PACKAGE_LIBNL)$(BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16),yy) +ifeq ($(BR2_PACKAGE_LIBNL)$(BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_16)$(BR2_PACKAGE_OPENVPN_DCO),yyy) OPENVPN_CONF_OPTS += --enable-dco OPENVPN_DEPENDENCIES += libnl else From cbb13979ecfb32a9b826a4b64d632e2254546451 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Sat, 14 May 2022 21:09:36 -0700 Subject: [PATCH 65/92] [WIP] package/mkbootimg: new host package Android bootimg utilities: mkbootimg and unpackbootimg. Signed-off-by: Christian Stewart --- v1: CHANGES REQUESTED (Pending) https://patchwork.ozlabs.org/project/buildroot/patch/20220724235818.679881-1-christian@paral.in/ --- package/Config.in.host | 1 + ...akefile-remove-cc-and-ar-definitions.patch | 97 +++++++++++++++++++ package/mkbootimg/Config.in.host | 4 + package/mkbootimg/mkbootimg.hash | 3 + package/mkbootimg/mkbootimg.mk | 26 +++++ 5 files changed, 131 insertions(+) create mode 100644 package/mkbootimg/0001-makefile-remove-cc-and-ar-definitions.patch create mode 100644 package/mkbootimg/Config.in.host create mode 100644 package/mkbootimg/mkbootimg.hash create mode 100644 package/mkbootimg/mkbootimg.mk diff --git a/package/Config.in.host b/package/Config.in.host index bf04f5fa97..69e48fb878 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -68,6 +68,7 @@ menu "Host utilities" source "package/mfgtools/Config.in.host" source "package/microchip-hss-payload-generator/Config.in.host" source "package/minisign/Config.in.host" + source "package/mkbootimg/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/mkbootimg/0001-makefile-remove-cc-and-ar-definitions.patch b/package/mkbootimg/0001-makefile-remove-cc-and-ar-definitions.patch new file mode 100644 index 0000000000..d61b1e0b88 --- /dev/null +++ b/package/mkbootimg/0001-makefile-remove-cc-and-ar-definitions.patch @@ -0,0 +1,97 @@ +From 04a62922ce238f3106a916a30c0c2995ffa1526c Mon Sep 17 00:00:00 2001 +From: Christian Stewart +Date: Sat, 14 May 2022 20:58:14 -0700 +Subject: [PATCH] makefile: remove cc and ar definitions + +Signed-off-by: Christian Stewart +--- + Makefile | 26 +------------------------- + libmincrypt/Makefile | 27 +++++---------------------- + 2 files changed, 6 insertions(+), 47 deletions(-) + +diff --git a/Makefile b/Makefile +index 6ee3a38c..39d0996b 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,29 +1,4 @@ + # Andrew Huang +-ifeq ($(CC),cc) +-CC = gcc +-endif +-AR = ar rcv +-ifeq ($(windir),) +-EXE = +-RM = rm -f +-else +-EXE = .exe +-RM = del +-endif +- +-CFLAGS = -ffunction-sections -O3 +- +-ifneq (,$(findstring darwin,$(CROSS_COMPILE))) +- UNAME_S := Darwin +-else +- UNAME_S := $(shell uname -s) +-endif +-ifeq ($(UNAME_S),Darwin) +- LDFLAGS += -Wl,-dead_strip +-else +- LDFLAGS += -Wl,--gc-sections -s +-endif +- + all:mkbootimg$(EXE) unpackbootimg$(EXE) + + static: +@@ -31,6 +6,7 @@ static: + + libmincrypt.a: + $(MAKE) -C libmincrypt ++ cp ./libmincrypt/libmincrypt.a ./libmincrypt.a + + mkbootimg$(EXE):mkbootimg.o libmincrypt.a + $(CROSS_COMPILE)$(CC) -o $@ $^ -L. -lmincrypt $(LDFLAGS) +diff --git a/libmincrypt/Makefile b/libmincrypt/Makefile +index ad482de9..c7c478ff 100755 +--- a/libmincrypt/Makefile ++++ b/libmincrypt/Makefile +@@ -1,31 +1,14 @@ +-ifeq ($(CC),cc) +-CC = gcc +-endif +-AR = ar rc +-ifeq ($(windir),) +-RM = rm -f +-CP = cp +-else +-RM = del +-CP = copy /y +-endif +- +-CFLAGS = -ffunction-sections -O3 +-EXT = a +-LIB = libmincrypt.$(EXT) ++LIB = libmincrypt.a + LIB_OBJS = dsa_sig.o p256.o p256_ec.o p256_ecdsa.o rsa.o sha.o sha256.o + INC = -I.. + +-all:$(LIB) ++all: $(LIB) + + clean: + $(RM) $(LIB_OBJS) $(LIB) + +-$(LIB):$(LIB_OBJS) +- $(CROSS_COMPILE)$(AR) $@ $^ +- $(CP) $@ .. +- ++$(LIB): $(LIB_OBJS) ++ $(CROSS_COMPILE)$(AR) rc $@ $^ + +-%.o:%.c ++%.o: %.c + $(CROSS_COMPILE)$(CC) -o $@ $(CFLAGS) -c $< $(INC) +- +-- +2.35.1 + diff --git a/package/mkbootimg/Config.in.host b/package/mkbootimg/Config.in.host new file mode 100644 index 0000000000..2ca7bcae00 --- /dev/null +++ b/package/mkbootimg/Config.in.host @@ -0,0 +1,4 @@ +config BR2_PACKAGE_HOST_MKBOOTIMG + bool "host mkbootimg" + help + Android Bootimg mkbootimg and unpackbootimg utils. diff --git a/package/mkbootimg/mkbootimg.hash b/package/mkbootimg/mkbootimg.hash new file mode 100644 index 0000000000..8beaf8d56c --- /dev/null +++ b/package/mkbootimg/mkbootimg.hash @@ -0,0 +1,3 @@ +# locally computed +sha256 28ddd4a2e472e4e044c9b461fb8e3ce04ea9af0bbbafc8010958df28d27707a7 mkbootimg-d4a2677828fe9b60117af8996dcf1dea85d6b431.tar.gz +sha256 b220fd3c79e0906eda798b23699305ab05576e849f45810eca74afcb2c7f2311 NOTICE diff --git a/package/mkbootimg/mkbootimg.mk b/package/mkbootimg/mkbootimg.mk new file mode 100644 index 0000000000..460e50aa9e --- /dev/null +++ b/package/mkbootimg/mkbootimg.mk @@ -0,0 +1,26 @@ +################################################################################ +# +# mkbootimg +# +################################################################################ + +MKBOOTIMG_VERSION = d4a2677828fe9b60117af8996dcf1dea85d6b431 +MKBOOTIMG_SITE = $(call github,osm0sis,mkbootimg,$(MKBOOTIMG_VERSION)) + +MKBOOTIMG_LICENSE = BSD-3-Clause +MKBOOTIMG_LICENSE_FILES = NOTICE + +HOST_MKBOOTIMG_TARGETS = mkbootimg unpackbootimg + +define HOST_MKBOOTIMG_BUILD_CMDS + $(foreach t,$(HOST_MKBOOTIMG_TARGETS),\ + $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) SRCDIR=$(@D) \ + -C $(@D) $(t)) +endef + +define HOST_MKBOOTIMG_INSTALL_CMDS + $(foreach t,$(HOST_MKBOOTIMG_TARGETS),\ + $(INSTALL) -D -m 0755 $(@D)/$(t) $(HOST_DIR)/bin/$(notdir $(t))$(sep)) +endef + +$(eval $(host-generic-package)) From 2dd286c1b57b0bc3007a9be5d42c99152f61e57d Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Fri, 10 Mar 2023 02:39:57 -0800 Subject: [PATCH 66/92] linux: run make prepare before make all Some Linux kernels do not correctly generate the include/generated path when running "make all" without first running "make prepare" Since running "make prepare" is always valid on any Linux kernel, take the extra step to explicitly run "make prepare" before "make all." Signed-off-by: Christian Stewart --- linux/linux.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/linux/linux.mk b/linux/linux.mk index 12699b8ee4..64ba113094 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -524,6 +524,7 @@ define LINUX_BUILD_CMDS $(foreach dts,$(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)), \ cp -f $(dts) $(LINUX_ARCH_PATH)/boot/dts/ ) + $(LINUX_MAKE_ENV) $(BR2_MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) prepare $(LINUX_MAKE_ENV) $(BR2_MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) all $(LINUX_MAKE_ENV) $(BR2_MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_TARGET_NAME) $(LINUX_BUILD_DTB) From 5c82f02a5f4bf4f99439f1ea7f4bbefd6dd267cb Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Tue, 16 May 2023 19:12:54 -0700 Subject: [PATCH 67/92] linux: add support for building device tree overlays Some kernels have device tree overlay files: make arch/arm64/boot/dts/amlogic/overlays/odroidn2/i2c0.dtbo Add an option to add these dtbo files to the LINUX_DTBS list. BR2_LINUX_KERNEL_INTREE_DTS_OVERLAY_NAME="amlogic/overlays/odroidn2/i2c0" Signed-off-by: Christian Stewart --- linux/Config.in | 19 +++++++++++++++++++ linux/linux.mk | 5 +++++ 2 files changed, 24 insertions(+) diff --git a/linux/Config.in b/linux/Config.in index 1e6842c44e..c395d50ee2 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -449,6 +449,25 @@ config BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT Choose this option to support Device Tree overlays on the target system. +if BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT + +config BR2_LINUX_KERNEL_INTREE_DTS_OVERLAY_NAME + string "In-tree Device Tree Overlay Source file names" + help + Name of in-tree device tree source file, without + the trailing .dts. You can provide a list of + dts overlay files to build, separated by spaces. + +config BR2_LINUX_KERNEL_CUSTOM_DTS_OVERLAY_PATH + string "Out-of-tree Device Tree Overlay 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 + be compiled from there to dtb overlays (.dtbo). + +endif + endif config BR2_LINUX_KERNEL_INSTALL_TARGET diff --git a/linux/linux.mk b/linux/linux.mk index 64ba113094..6ea4872632 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -212,6 +212,11 @@ LINUX_DTS_NAME += $(basename $(filter %.dts,$(notdir $(call qstrip,$(BR2_LINUX_K LINUX_DTBS = $(addsuffix .dtb,$(LINUX_DTS_NAME)) +LINUX_DTS_OVERLAY_NAME += $(call qstrip,$(BR2_LINUX_KERNEL_INTREE_DTS_OVERLAY_NAME)) +LINUX_DTS_OVERLAY_NAME += $(basename $(filter %.dts,$(notdir $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_OVERLAY_PATH))))) + +LINUX_DTBS += $(addsuffix .dtbo,$(LINUX_DTS_OVERLAY_NAME)) + ifeq ($(BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM),y) LINUX_IMAGE_NAME = $(call qstrip,$(BR2_LINUX_KERNEL_IMAGE_NAME)) LINUX_TARGET_NAME = $(call qstrip,$(BR2_LINUX_KERNEL_IMAGE_TARGET_NAME)) From c2ebd303c2406e01131489703646705274f53653 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Fri, 5 Jun 2020 20:22:20 -0700 Subject: [PATCH 68/92] package/linux-firmware: add support for nvidia files Signed-off-by: Christian Stewart --- package/linux-firmware/Config.in | 5 +++++ package/linux-firmware/linux-firmware.mk | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in index 4630252c5e..8de2415926 100644 --- a/package/linux-firmware/Config.in +++ b/package/linux-firmware/Config.in @@ -29,6 +29,11 @@ config BR2_PACKAGE_LINUX_FIRMWARE_I915 help Firmware files for the Intel i915 video cards. +config BR2_PACKAGE_LINUX_FIRMWARE_NVIDIA + bool "Nvidia video card firmware" + help + Firmware files for the Nvidia video cards. + config BR2_PACKAGE_LINUX_FIRMWARE_RADEON bool "AMD Radeon video card firmware" help diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 76bc6127f7..f340272bda 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -25,6 +25,11 @@ LINUX_FIRMWARE_DIRS += i915 LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.i915 endif +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_NVIDIA),y) +LINUX_FIRMWARE_DIRS += nvidia +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.nvidia +endif + ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_RADEON),y) LINUX_FIRMWARE_DIRS += radeon LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.radeon From e5c9a321cd6888e7e0847a5c9b080dc4b486984b Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Sat, 14 Nov 2020 01:48:28 -0800 Subject: [PATCH 69/92] package/linux-firmware: add option for rockchip dptx Signed-off-by: Christian Stewart --- package/linux-firmware/Config.in | 5 +++++ package/linux-firmware/linux-firmware.mk | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in index 8de2415926..cec4bdbc3c 100644 --- a/package/linux-firmware/Config.in +++ b/package/linux-firmware/Config.in @@ -54,6 +54,11 @@ config BR2_PACKAGE_LINUX_FIRMWARE_MFC_V8 help Firmware files for Samsung MFC video encoder/decoder driver v8 +config BR2_PACKAGE_LINUX_FIRMWARE_ROCKCHIP_DPTX + bool "Rockchip dptx" + help + Firmware files for RockChip dptx (DisplayPort). + endmenu # Video menu "Bluetooth firmware" diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index f340272bda..aaad0d2023 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -687,6 +687,11 @@ LINUX_FIRMWARE_FILES += \ LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.rtlwifi_firmware.txt endif +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_ROCKCHIP_DPTX),y) +LINUX_FIRMWARE_FILES += rockchip/dptx.bin +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.rockchip +endif + ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169),y) LINUX_FIRMWARE_FILES += \ rtl_nic/rtl8105e-1.fw \ From 64e1defb9b72c71871cbb7faab7d363d1a85e92e Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Tue, 10 May 2022 05:53:25 -0700 Subject: [PATCH 70/92] package/linux-firmware: add support for ti vpdma Add a symlink to the expected location for vpdma-1ba in the root of the firmware directory. Signed-off-by: Christian Stewart --- ...i-tspa-add-link-to-vpdma-1ba-in-root.patch | 25 +++++++++++++++++++ package/linux-firmware/Config.in | 5 ++++ package/linux-firmware/linux-firmware.hash | 4 ++- package/linux-firmware/linux-firmware.mk | 5 ++++ 4 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 package/linux-firmware/0001-ti-tspa-add-link-to-vpdma-1ba-in-root.patch diff --git a/package/linux-firmware/0001-ti-tspa-add-link-to-vpdma-1ba-in-root.patch b/package/linux-firmware/0001-ti-tspa-add-link-to-vpdma-1ba-in-root.patch new file mode 100644 index 0000000000..789c074ee1 --- /dev/null +++ b/package/linux-firmware/0001-ti-tspa-add-link-to-vpdma-1ba-in-root.patch @@ -0,0 +1,25 @@ +From 25e53eaf9e766713bed499cfff6f43855cd35e61 Mon Sep 17 00:00:00 2001 +From: Christian Stewart +Date: Tue, 10 May 2022 06:21:46 -0700 +Subject: [PATCH] ti-tspa: add link to vpdma-1ba in root + +Signed-off-by: Christian Stewart +--- + WHENCE | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/WHENCE b/WHENCE +index eab2f22..6f08e79 100644 +--- a/WHENCE ++++ b/WHENCE +@@ -3034,6 +3034,7 @@ Licence: Redistributable. See LICENCE.tda7706-firmware.txt for details. + Driver: ti-vpe - Texas Instruments V4L2 driver for Video Processing Engine + + File: ti/vpdma-1b8.bin ++Link: vpdma-1b8.bin -> ti/vpdma-1b8.bin + + Licence: Redistributable. See LICENCE.ti-tspa for details. + +-- +2.35.1 + diff --git a/package/linux-firmware/Config.in b/package/linux-firmware/Config.in index cec4bdbc3c..add32adda5 100644 --- a/package/linux-firmware/Config.in +++ b/package/linux-firmware/Config.in @@ -59,6 +59,11 @@ config BR2_PACKAGE_LINUX_FIRMWARE_ROCKCHIP_DPTX help Firmware files for RockChip dptx (DisplayPort). +config BR2_PACKAGE_LINUX_FIRMWARE_TI_VPDMA + bool "TI VPDMA" + help + Firmware files for TI Video Port Direct Memory Engine. + endmenu # Video menu "Bluetooth firmware" diff --git a/package/linux-firmware/linux-firmware.hash b/package/linux-firmware/linux-firmware.hash index 9125352475..35adf0e64f 100644 --- a/package/linux-firmware/linux-firmware.hash +++ b/package/linux-firmware/linux-firmware.hash @@ -40,6 +40,8 @@ sha256 8542aeabf2761935122d693561e16766ce1bcc2b0d003204f9040b7d6d929f2e LICENS sha256 be904cd28cb292b80cdb6cf412ab0d9159d431671e987ad433c1f62e0988a9bc LICENSE.qcom sha256 fc6223d4bfe9f2f9e2eddc44b9fe5721d0caf49f01cb08d602906add686d8c6f LICENSE.radeon sha256 2bdd2e716f05d9737d3f9a20f9a3a3c0caee0e866100ddb0673f1178e42f92b9 LICENSE.sdma_firmware -sha256 feb7f80e7805e0c88b1ea7588410822710e5c3c5cd5b685f75327a4d35798447 WHENCE +sha256 5bc52a8ad08b531ee17fb3c35b8f83c8649c9aecfb6ce7a7975ee62d840f4c9b LICENCE.ti-tspa +sha256 bc5225a57f49c5249dcf238e4ae6437811677a2a8a7f579c3d839e058653ee44 LICENCE.nvidia +sha256 5f18b64d2fe1e5664ee8df351bd9aea97ce29719529a45a8f54de64e7e3e402a WHENCE sha256 fa43e1b9a13b341a07adca9dbe73d0f9072d7966fdfe811c01f0dd2872d7309a qcom/NOTICE.txt sha256 bef9c828e84f21e7835b4de7daf954a327e1ff777871b58e116039b684c0d604 LICENCE.e100 diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index aaad0d2023..0b7cefdf39 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -692,6 +692,11 @@ LINUX_FIRMWARE_FILES += rockchip/dptx.bin LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.rockchip endif +ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_TI_VPDMA),y) +LINUX_FIRMWARE_FILES += ti/vpdma-1b8.bin +LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ti-tspa +endif + ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169),y) LINUX_FIRMWARE_FILES += \ rtl_nic/rtl8105e-1.fw \ From 92b931d96b86b46248231471950f23199c671124 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Mon, 19 Aug 2024 13:13:07 -0700 Subject: [PATCH 71/92] package/rpi-firmware: update to latest Update to the latest master branch revision. https://github.com/raspberrypi/firmware Signed-off-by: Christian Stewart --- package/rpi-firmware/rpi-firmware.hash | 2 +- package/rpi-firmware/rpi-firmware.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rpi-firmware/rpi-firmware.hash b/package/rpi-firmware/rpi-firmware.hash index 4501db739c..d7e20345c6 100644 --- a/package/rpi-firmware/rpi-firmware.hash +++ b/package/rpi-firmware/rpi-firmware.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 00fe5487376e9d5ed14cbc72a9b7a5bd8d6900c84aee10f6d656f192a26d161c rpi-firmware-5476720d52cf579dc1627715262b30ba1242525e.tar.gz +sha256 9e420d03c5daabe99dfe4a6148c56ff61c53935859525b5c063a9dc98675fda2 rpi-firmware-6b029c7772b5d29a50a07c477a808a7effb0a373.tar.gz sha256 c7283ff51f863d93a275c66e3b4cb08021a5dd4d8c1e7acc47d872fbe52d3d6b boot/LICENCE.broadcom diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk index 7ae9ff6c28..f0a27f1229 100644 --- a/package/rpi-firmware/rpi-firmware.mk +++ b/package/rpi-firmware/rpi-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_FIRMWARE_VERSION = 5476720d52cf579dc1627715262b30ba1242525e +RPI_FIRMWARE_VERSION = 6b029c7772b5d29a50a07c477a808a7effb0a373 RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION)) RPI_FIRMWARE_LICENSE = BSD-3-Clause RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom From 4f20ef8671f2cafaae9e55e7d7673be58661d869 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Sun, 23 Aug 2020 00:00:30 -0700 Subject: [PATCH 72/92] package/nvidia-driver: bump to version 510.73.05 This series is currently marked "stable" on the gentoo repo. Signed-off-by: Christian Stewart --- ...-mismatch-unconditonally-to-conftest.patch | 25 +++++++++++++++++++ package/nvidia-driver/nvidia-driver.hash | 3 +++ package/nvidia-driver/nvidia-driver.mk | 9 ++++++- 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 package/nvidia-driver/0001-Add-ignore-CC-mismatch-unconditonally-to-conftest.patch diff --git a/package/nvidia-driver/0001-Add-ignore-CC-mismatch-unconditonally-to-conftest.patch b/package/nvidia-driver/0001-Add-ignore-CC-mismatch-unconditonally-to-conftest.patch new file mode 100644 index 0000000000..60eb2f8abe --- /dev/null +++ b/package/nvidia-driver/0001-Add-ignore-CC-mismatch-unconditonally-to-conftest.patch @@ -0,0 +1,25 @@ +From c4233ad92256006f7db42efe7cdaf08079d74977 Mon Sep 17 00:00:00 2001 +From: Christian Stewart +Date: Sat, 22 Aug 2020 23:58:51 -0700 +Subject: [PATCH] Add ignore CC mismatch unconditionally to conftest + +Signed-off-by: Christian Stewart +--- + kernel/conftest.sh | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/kernel/conftest.sh b/kernel/conftest.sh +index a4ebf81..4ad452e 100755 +--- a/kernel/conftest.sh ++++ b/kernel/conftest.sh +@@ -3882,6 +3882,7 @@ case "$5" in + IGNORE_CC_MISMATCH=1 + fi + ++ IGNORE_CC_MISMATCH=1 + if [ -n "$IGNORE_CC_MISMATCH" ]; then + exit 0 + fi +-- +2.28.0 + diff --git a/package/nvidia-driver/nvidia-driver.hash b/package/nvidia-driver/nvidia-driver.hash index 620112e6c8..47086e19ee 100644 --- a/package/nvidia-driver/nvidia-driver.hash +++ b/package/nvidia-driver/nvidia-driver.hash @@ -1,4 +1,7 @@ # Locally computed sha256 94e399b459659c12b1344e8c8f4f5eee1ed5915ff459fc8bb831c9e1d44677db NVIDIA-Linux-x86-390.151.run sha256 6e4fd2258465f5d5527fe80abd46de925a30348b4a84658498a6d75caf42c47c NVIDIA-Linux-x86_64-390.151-no-compat32.run +sha256 8087fa71bc73d2941dd55e1affc89b078c7bfc87461d996ac2edf269ae0857b2 NVIDIA-Linux-x86_64-510.73.05.run +sha256 595465d138a63071170ea1de20ebe9bdef59c9a97d7c4325c0a04abb4bc15719 NVIDIA-Linux-x86_64-510.73.05-no-compat32.run +sha256 6ac030d692d45c065ad88d30fb7358834df9ceb4f37caaad459a4d7c64877ea7 NVIDIA-Linux-x86_64-470.129.06-no-compat32.run sha256 bd28b0c5aeeb00eb11d3ec6f6f3449d4b3a40100914258332734a53527997526 LICENSE diff --git a/package/nvidia-driver/nvidia-driver.mk b/package/nvidia-driver/nvidia-driver.mk index f1217b00aa..ef5b8ee5a8 100644 --- a/package/nvidia-driver/nvidia-driver.mk +++ b/package/nvidia-driver/nvidia-driver.mk @@ -4,8 +4,15 @@ # ################################################################################ +# current stable (per gentoo) +NVIDIA_DRIVER_VERSION = 510.73.05 + +ifeq ($(BR2_x86_64),y) +NVIDIA_DRIVER_SUFFIX = _64 +else NVIDIA_DRIVER_VERSION = 390.151 -NVIDIA_DRIVER_SUFFIX = $(if $(BR2_x86_64),_64) +endif # BR2_x86_64 + NVIDIA_DRIVER_SITE = http://download.nvidia.com/XFree86/Linux-x86$(NVIDIA_DRIVER_SUFFIX)/$(NVIDIA_DRIVER_VERSION) NVIDIA_DRIVER_SOURCE = NVIDIA-Linux-x86$(NVIDIA_DRIVER_SUFFIX)-$(NVIDIA_DRIVER_VERSION)$(if $(BR2_x86_64),-no-compat32).run NVIDIA_DRIVER_LICENSE = NVIDIA Software License From bd9d7e22cdcfc18aad79321e9d89d1a9518a56fd Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Tue, 16 Aug 2022 16:27:16 -0700 Subject: [PATCH 73/92] package/nvidia-driver: add latest version 525.125.06 Signed-off-by: Christian Stewart --- package/nvidia-driver/Config.in | 3 +++ package/nvidia-driver/nvidia-driver.hash | 4 ++++ package/nvidia-driver/nvidia-driver.mk | 5 ++++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/package/nvidia-driver/Config.in b/package/nvidia-driver/Config.in index e4a9dde0a0..3d714a1e52 100644 --- a/package/nvidia-driver/Config.in +++ b/package/nvidia-driver/Config.in @@ -14,6 +14,9 @@ config BR2_PACKAGE_NVIDIA_DRIVER if BR2_PACKAGE_NVIDIA_DRIVER +config BR2_PACKAGE_NVIDIA_DRIVER_LATEST + bool "use latest production branch version" + comment "nvidia-driver X.org drivers needs a modular Xorg server" depends on !BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR diff --git a/package/nvidia-driver/nvidia-driver.hash b/package/nvidia-driver/nvidia-driver.hash index 47086e19ee..b0dbe43de5 100644 --- a/package/nvidia-driver/nvidia-driver.hash +++ b/package/nvidia-driver/nvidia-driver.hash @@ -4,4 +4,8 @@ sha256 6e4fd2258465f5d5527fe80abd46de925a30348b4a84658498a6d75caf42c47c NVIDIA sha256 8087fa71bc73d2941dd55e1affc89b078c7bfc87461d996ac2edf269ae0857b2 NVIDIA-Linux-x86_64-510.73.05.run sha256 595465d138a63071170ea1de20ebe9bdef59c9a97d7c4325c0a04abb4bc15719 NVIDIA-Linux-x86_64-510.73.05-no-compat32.run sha256 6ac030d692d45c065ad88d30fb7358834df9ceb4f37caaad459a4d7c64877ea7 NVIDIA-Linux-x86_64-470.129.06-no-compat32.run +sha256 141777e1ca2f11e97d8d33260213f1be327eb73922ae22f4ddab404bb2ef4664 NVIDIA-Linux-x86_64-515.86.01.run +sha256 a16f2cba9c56d47a6c1fca14a80968b8fc4ce20f59330d265aad0fef56f19fb6 NVIDIA-Linux-x86_64-515.86.01-no-compat32.run +sha256 4605db4d77ebfc2ad282709c748fbd973f8f2599d3188f307b9327b168d507e5 NVIDIA-Linux-x86_64-525.125.06-no-compat32.run +sha256 b5275689f4a833c37a507717ac8f0ee2f1f5cd2b7e236ffa70aad8dfb7455b9d NVIDIA-Linux-x86_64-525.125.06.run sha256 bd28b0c5aeeb00eb11d3ec6f6f3449d4b3a40100914258332734a53527997526 LICENSE diff --git a/package/nvidia-driver/nvidia-driver.mk b/package/nvidia-driver/nvidia-driver.mk index ef5b8ee5a8..016ac4b756 100644 --- a/package/nvidia-driver/nvidia-driver.mk +++ b/package/nvidia-driver/nvidia-driver.mk @@ -4,9 +4,12 @@ # ################################################################################ -# current stable (per gentoo) NVIDIA_DRIVER_VERSION = 510.73.05 +ifeq ($(BR2_PACKAGE_NVIDIA_DRIVER_LATEST),y) +NVIDIA_DRIVER_VERSION = 525.125.06 +endif + ifeq ($(BR2_x86_64),y) NVIDIA_DRIVER_SUFFIX = _64 else From b832964543a0e59acd1b3b5ea8d32af982a648d1 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Fri, 30 Apr 2021 18:50:35 -0700 Subject: [PATCH 74/92] host-localedef: disable Werror to avoid build failures Signed-off-by: Christian Stewart --- package/localedef/localedef.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/localedef/localedef.mk b/package/localedef/localedef.mk index 7a6c94bd2f..8575ad0035 100644 --- a/package/localedef/localedef.mk +++ b/package/localedef/localedef.mk @@ -39,6 +39,7 @@ define HOST_LOCALEDEF_CONFIGURE_CMDS --with-pkgversion="Buildroot" \ --without-cvs \ --disable-profile \ + --disable-werror \ --without-gd \ --enable-obsolete-rpc) endef From 4fb3facc3b0ed4156ae889645bf63cf3baca0e87 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Mon, 11 Jul 2022 08:11:39 -0700 Subject: [PATCH 75/92] arch/arm: add cortex-a77 armv8.2a core Signed-off-by: Christian Stewart --- arch/Config.in.arm | 8 ++++++++ package/kvm-unit-tests/Config.in | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/arch/Config.in.arm b/arch/Config.in.arm index 546ba8070e..2d0677f5a1 100644 --- a/arch/Config.in.arm +++ b/arch/Config.in.arm @@ -474,6 +474,14 @@ config BR2_cortex_a76_a55 select BR2_ARM_CPU_HAS_FP_ARMV8 select BR2_ARM_CPU_ARMV8A select BR2_ARCH_NEEDS_GCC_AT_LEAST_9 +config BR2_cortex_a77 + bool "cortex-A77" + select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64 + select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64 + select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64 + select BR2_ARM_CPU_HAS_FP_ARMV8 + select BR2_ARM_CPU_ARMV8A + select BR2_ARCH_NEEDS_GCC_AT_LEAST_11 config BR2_cortex_a78 bool "cortex-A78" select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64 diff --git a/package/kvm-unit-tests/Config.in b/package/kvm-unit-tests/Config.in index 02ea8dd58c..d5d2b1ba73 100644 --- a/package/kvm-unit-tests/Config.in +++ b/package/kvm-unit-tests/Config.in @@ -7,7 +7,7 @@ config BR2_PACKAGE_KVM_UNIT_TESTS_ARCH_SUPPORTS BR2_cortex_a17 || BR2_cortex_a17_a7 || \ BR2_cortex_a55 || BR2_cortex_a75 || \ BR2_cortex_a75_a55 || BR2_cortex_a76 || \ - BR2_cortex_a76_a55) + BR2_cortex_a76_a55 || BR2_cortex_a77) default y if BR2_i386 || BR2_x86_64 default y if BR2_powerpc64 || BR2_powerpc64le default y if BR2_s390x From 80cc45b494357783da10461f4c74b4d6358423ca Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Thu, 2 Jul 2020 11:16:00 -0700 Subject: [PATCH 76/92] package/rngd: start rngd early in the boot process Lack of an RNG source can block boot-up on headless systems with few hardware entropy sources. This patch allows rngd to start earlier than the current "basic.target" when systemd is used. Removing the dependency on "basic.target" and by extension, "sockets.target" will allow rngd to start before, for example, docker.sock - which can take some time to become ready without entropy. This is a cherry-pick of a peer project patch: https://patchwork.openembedded.org/patch/163303/ Signed-off-by: Christian Stewart --- package/rng-tools/rngd.service | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/rng-tools/rngd.service b/package/rng-tools/rngd.service index 11386d1e5d..28ef65a129 100644 --- a/package/rng-tools/rngd.service +++ b/package/rng-tools/rngd.service @@ -1,5 +1,9 @@ [Unit] Description=Hardware RNG Entropy Gatherer Daemon +DefaultDependencies=no +After=systemd-udev-settle.service +Before=sysinit.target shutdown.target +Conflicts=shutdown.target [Service] ExecStart=/usr/sbin/rngd -f $DAEMON_ARGS From aad8c528eb48d9023c5d54ac6b65b60043152c7a Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Thu, 1 Sep 2022 22:21:53 -0700 Subject: [PATCH 77/92] boot/refind: new package rEFInd is a user-friendly EFI GUI for boot selection. It can be used as an alternative to Grub with a user-friendly graphical and/or text interface for selecting a boot option. Enabling the BR2_TARGET_REFIND option builds rEFInd with gnu-efi, placing the files intended for the EFI partition in images/efi-part. The default refind.conf interactively displays a list of boot options on startup, including detected Buildroot Linux kernel/initrd files. https://www.rodsbooks.com/refind/ Signed-off-by: Christian Stewart --- v1: CHANGES REQUESTED (some items remain TODO) https://patchwork.ozlabs.org/project/buildroot/patch/20220904190940.200587-1-christian@paral.in/ v1 -> v2: - Add more information to commit message - Removed refind-install patch - Implemented simpler install steps in the .mk file instead --- DEVELOPERS | 1 + boot/Config.in | 1 + ...-environment-variables-for-toolchain.patch | 58 ++++++++++++++ boot/refind/Config.in | 27 +++++++ boot/refind/readme.txt | 42 ++++++++++ boot/refind/refind.hash | 5 ++ boot/refind/refind.mk | 79 +++++++++++++++++++ 7 files changed, 213 insertions(+) create mode 100644 boot/refind/0001-Make.common-use-environment-variables-for-toolchain.patch create mode 100644 boot/refind/Config.in create mode 100644 boot/refind/readme.txt create mode 100644 boot/refind/refind.hash create mode 100644 boot/refind/refind.mk diff --git a/DEVELOPERS b/DEVELOPERS index 5f98257b86..a181a40e31 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -619,6 +619,7 @@ N: Christian Kellermann F: package/python-pylibftdi/ N: Christian Stewart +F: boot/refind/ F: package/balena-engine/ F: package/batman-adv/ F: package/catatonit/ diff --git a/boot/Config.in b/boot/Config.in index f167346cdf..69507bfc6d 100644 --- a/boot/Config.in +++ b/boot/Config.in @@ -12,6 +12,7 @@ source "boot/mv-ddr-marvell/Config.in" source "boot/mxs-bootlets/Config.in" source "boot/optee-os/Config.in" source "boot/opensbi/Config.in" +source "boot/refind/Config.in" source "boot/s500-bootloader/Config.in" source "boot/shim/Config.in" source "boot/syslinux/Config.in" diff --git a/boot/refind/0001-Make.common-use-environment-variables-for-toolchain.patch b/boot/refind/0001-Make.common-use-environment-variables-for-toolchain.patch new file mode 100644 index 0000000000..45b462b962 --- /dev/null +++ b/boot/refind/0001-Make.common-use-environment-variables-for-toolchain.patch @@ -0,0 +1,58 @@ +From 1ab4b8b448f87167d512222e0de92c0fb2e73b0e Mon Sep 17 00:00:00 2001 +From: Christian Stewart +Date: Fri, 2 Sep 2022 00:41:13 -0700 +Subject: [PATCH] Make.common: use environment variables for toolchain + +Use the environment specified CC, LD, etc. + +Signed-off-by: Christian Stewart +--- + Make.common | 30 ------------------------------ + 1 file changed, 30 deletions(-) + +diff --git a/Make.common b/Make.common +index 95a3a97..62c1059 100644 +--- a/Make.common ++++ b/Make.common +@@ -17,38 +17,8 @@ + # used to compile rEFInd.... + # + +-EFIINC = /usr/include/efi +-GNUEFILIB = /usr/lib +-EFILIB = /usr/lib +-EFICRT0 = /usr/lib +- +-# Comment out above and uncomment below if using locally-compiled GNU-EFI.... +-#EFIINC = /usr/local/include/efi +-#GNUEFILIB = /usr/local/lib +-#EFILIB = /usr/local/lib +-#EFICRT0 = /usr/local/lib +- +-HOSTARCH = $(shell uname -m | sed s,i[3456789]86,ia32,) +-ARCH ?= $(HOSTARCH) +- + # Note: TIANOBASE is defined in master Makefile and exported + GENFW = $(TIANOBASE)/BaseTools/Source/C/bin/GenFw +-prefix = /usr/bin/ +-ifeq ($(ARCH),aarch64) +- CC = $(prefix)aarch64-linux-gnu-gcc +- AS = $(prefix)aarch64-linux-gnu-as +- LD = $(prefix)aarch64-linux-gnu-ld +- AR = $(prefix)aarch64-linux-gnu-ar +- RANLIB = $(prefix)aarch64-linux-gnu-ranlib +- OBJCOPY = $(prefix)aarch64-linux-gnu-objcopy +-else +- CC = $(prefix)gcc +- AS = $(prefix)as +- LD = $(prefix)ld +- AR = $(prefix)ar +- RANLIB = $(prefix)ranlib +- OBJCOPY = $(prefix)objcopy +-endif + + ifeq ($(MAKEWITH),TIANO) + # Below file defines TARGET (RELEASE or DEBUG) and TOOL_CHAIN_TAG (GCC44, GCC45, GCC46, or GCC47) +-- +2.37.2 + diff --git a/boot/refind/Config.in b/boot/refind/Config.in new file mode 100644 index 0000000000..3c817e1c65 --- /dev/null +++ b/boot/refind/Config.in @@ -0,0 +1,27 @@ +config BR2_PACKAGE_REFIND_ARCH_SUPPORTS + bool + default y if BR2_i386 + default y if BR2_x86_64 + default y if BR2_aarch64 + depends on BR2_USE_MMU + +menuconfig BR2_TARGET_REFIND + bool "refind" + depends on BR2_PACKAGE_REFIND_ARCH_SUPPORTS + select BR2_PACKAGE_GNU_EFI + help + rEFInd presents a user-friendly GUI for boot selection. + + For additional notes on using rEFInd with Buildroot, see + boot/refind/readme.txt + + https://www.rodsbooks.com/refind/ + +if BR2_TARGET_REFIND + +config BR2_TARGET_REFIND_RENAME_TO_BOOT + bool "rename refind efi files to BOOT" + help + Move refind EFI directory to the default BOOT path. + +endif diff --git a/boot/refind/readme.txt b/boot/refind/readme.txt new file mode 100644 index 0000000000..d4bc326e6f --- /dev/null +++ b/boot/refind/readme.txt @@ -0,0 +1,42 @@ +Notes on using rEFInd +============================================= + +1. Create a disk image + dd if=/dev/zero of=disk.img bs=1M count=32 +2. Partition it (either legacy or GPT style partitions work) + - Create one fat16 partition, labeled BOOT, flags boot, lba. + - Create one ext4 partition, type Linux, for the root fs. +3. Setup loop device and loop partitions + sudo losetup -f disk.img + sudo partx -a /dev/loop0 +4. Prepare the partition contents + sudo mkfs.fat -F 16 -L BOOT /dev/loop0p1 + sudo mkfs.ext4 -L root /dev/loop0p2 + sudo mount /dev/loop0p1 /mnt + sudo tar -C /mnt -xf output/images/refind.tar + sudo umount /mnt + sudo mount /dev/loop0p2 /mnt + sudo tar -C /mnt -xf output/images/rootfs.tar + sudo umount /mnt +5. Cleanup loop device + sudo partx -d /dev/loop0 + sudo losetup -d /dev/loop0 +6. Your disk.img is ready! + +Configuring rEFInd +============================================= + +rEFInd will search for refind_linux.conf files. + +Place a refind_linux.conf file in the same location as your initrd: + +"Boot Buildroot" "initrd=/boot/initrd-%v root=/dev/initrd ro earlyprintk" + +rEFInd will find all files with prefix initrd- and display options on screen, +defaulting to the most recent build version. + +Example contents of /boot: + +bzImage-buildroot-2022.05.1-104-1 +initrd-buildroot-2022.05.1-104-1 +refind_linux.conf diff --git a/boot/refind/refind.hash b/boot/refind/refind.hash new file mode 100644 index 0000000000..da644af4c5 --- /dev/null +++ b/boot/refind/refind.hash @@ -0,0 +1,5 @@ +# Locally computed +sha256 7a3e3f0f81bd4ae95f24e120f44e01319231f488fef7cc8bf03a1aea23c6cfd1 refind-src-0.13.3.1.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.txt +sha256 cebbc60079d3e79a1d94bf7c63482ca27d8ce58739d28c5e209bbd378337729b LICENSE.txt +sha256 4748f03ed2dbcc14cde6ebc30799899c403e356a7465dc30fcf2b80c45fc0059 docs/refind/FDL-1.3.txt diff --git a/boot/refind/refind.mk b/boot/refind/refind.mk new file mode 100644 index 0000000000..476ec5c330 --- /dev/null +++ b/boot/refind/refind.mk @@ -0,0 +1,79 @@ +################################################################################ +# +# refind +# +################################################################################ + +REFIND_VERSION = 0.13.3.1 +REFIND_SITE = http://downloads.sourceforge.net/project/refind/$(REFIND_VERSION) +REFIND_SOURCE = refind-src-$(REFIND_VERSION).tar.gz +REFIND_LICENSE = GPL-3.0+, GFDL-1.3+ (docs) +REFIND_LICENSE_FILES = COPYING.txt LICENSE.txt docs/refind/FDL-1.3.txt +REFIND_DEPENDENCIES = gnu-efi +REFIND_INSTALL_IMAGES = YES + +REFIND_TARGET = all_gnuefi +REFIND_EFI_ARGS = \ + EFICRT0=$(STAGING_DIR)/usr/lib \ + EFIINC=$(STAGING_DIR)/usr/include/efi \ + EFILIB=$(STAGING_DIR)/usr/lib \ + GNUEFILIB=$(STAGING_DIR)/usr/lib \ + LIBDIR=$(STAGING_DIR)/usr/lib \ + LIBEFI=$(STAGING_DIR)/usr/lib/libefi.a + +ifeq ($(BR2_x86_64),y) +REFIND_ARCH = x86_64 +REFIND_PLATFORM = x64 +else ifeq ($(BR2_aarch64),y) +REFIND_ARCH = aarch64 +REFIND_PLATFORM = aa64 +else +REFIND_ARCH = ia32 +REFIND_PLATFORM = ia32 +endif + +REFIND_EFI_PART_DIR = $(BINARIES_DIR)/efi-part +REFIND_BINARIES_DIR = $(REFIND_EFI_PART_DIR)/EFI/refind + +define REFIND_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE1) \ + ARCH="$(REFIND_ARCH)" \ + AS="$(TARGET_AS)" \ + CC="$(TARGET_CC)" \ + LD="$(TARGET_LD)" \ + MAKEWITH="GNUEFI" \ + OBJCOPY="$(TARGET_OBJCOPY)" \ + PYTHON=$(HOST_DIR)/bin/python3 \ + RANLIB="$(TARGET_RANLIB)" \ + $(REFIND_EFI_ARGS) -C $(@D) $(REFIND_TARGET) +endef + +define REFIND_INSTALL_IMAGES_CMDS + if [ -d $(REFIND_BINARIES_DIR) ]; then \ + rm -rf $(REFIND_BINARIES_DIR); \ + fi + $(INSTALL) -m 0755 -D $(@D)/refind/refind_$(REFIND_PLATFORM).efi \ + $(REFIND_BINARIES_DIR)/refind_$(REFIND_PLATFORM).efi + cp -r $(@D)/drivers_$(REFIND_PLATFORM) \ + $(REFIND_BINARIES_DIR)/drivers_$(REFIND_PLATFORM) + echo "refind_$(REFIND_PLATFORM).efi,rEFInd Boot Manager,,Entry for rEFInd" > \ + $(REFIND_BINARIES_DIR)/BOOT.CSV + echo "# rEFInd configuration\ntimeout 20\n" > \ + $(REFIND_BINARIES_DIR)/refind.conf +endef + +ifeq ($(BR2_TARGET_REFIND_RENAME_TO_BOOT),y) +define REFIND_IMAGES_RENAME_TO_BOOT + if [ -d $(REFIND_EFI_PART_DIR)/EFI/BOOT ]; then \ + rm -rf $(REFIND_EFI_PART_DIR)/EFI/BOOT; \ + fi + mv $(REFIND_BINARIES_DIR)/ $(REFIND_EFI_PART_DIR)/EFI/BOOT/ + mv $(REFIND_EFI_PART_DIR)/EFI/BOOT/refind_$(REFIND_PLATFORM).efi \ + $(REFIND_EFI_PART_DIR)/EFI/BOOT/BOOT$(REFIND_PLATFORM).EFI + echo "BOOT$(REFIND_PLATFORM).EFI,rEFInd Boot Manager,,Entry for rEFInd" > \ + $(REFIND_EFI_PART_DIR)/EFI/BOOT/BOOT.CSV +endef +REFIND_POST_INSTALL_IMAGES_HOOKS += REFIND_IMAGES_RENAME_TO_BOOT +endif + +$(eval $(generic-package)) From 237e5d1489e1f21026860583adda82701002c7c6 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Sun, 22 Jan 2023 18:45:02 -0800 Subject: [PATCH 78/92] boot/refind-bin: new package rEFInd is a user-friendly EFI GUI for boot selection. It can be used as an alternative to Grub with a user-friendly graphical and/or text interface for selecting a boot option. Enabling the BR2_TARGET_REFIND option builds rEFInd with gnu-efi, placing the files intended for the EFI partition in images/efi-part. The default refind.conf interactively displays a list of boot options on startup, including detected Buildroot Linux kernel/initrd files. https://www.rodsbooks.com/refind/ Add a binary release variant. Signed-off-by: Christian Stewart --- note: in future refind and refind-bin might be merged. --- boot/Config.in | 1 + boot/refind-bin/Config.in | 28 +++++++++++++++ boot/refind-bin/readme.txt | 42 ++++++++++++++++++++++ boot/refind-bin/refind-bin.hash | 5 +++ boot/refind-bin/refind-bin.mk | 63 +++++++++++++++++++++++++++++++++ 5 files changed, 139 insertions(+) create mode 100644 boot/refind-bin/Config.in create mode 100644 boot/refind-bin/readme.txt create mode 100644 boot/refind-bin/refind-bin.hash create mode 100644 boot/refind-bin/refind-bin.mk diff --git a/boot/Config.in b/boot/Config.in index 69507bfc6d..28c0dc2e09 100644 --- a/boot/Config.in +++ b/boot/Config.in @@ -13,6 +13,7 @@ source "boot/mxs-bootlets/Config.in" source "boot/optee-os/Config.in" source "boot/opensbi/Config.in" source "boot/refind/Config.in" +source "boot/refind-bin/Config.in" source "boot/s500-bootloader/Config.in" source "boot/shim/Config.in" source "boot/syslinux/Config.in" diff --git a/boot/refind-bin/Config.in b/boot/refind-bin/Config.in new file mode 100644 index 0000000000..7bc19d00e6 --- /dev/null +++ b/boot/refind-bin/Config.in @@ -0,0 +1,28 @@ +config BR2_PACKAGE_REFIND_BIN_ARCH_SUPPORTS + bool + default y if BR2_i386 + default y if BR2_x86_64 + default y if BR2_aarch64 + depends on BR2_USE_MMU + +menuconfig BR2_TARGET_REFIND_BIN + bool "refind-bin" + depends on BR2_PACKAGE_REFIND_BIN_ARCH_SUPPORTS + help + rEFInd presents a user-friendly GUI for boot selection. + + For additional notes on using rEFInd with Buildroot, see + boot/refind/readme.txt + + This is the pre-compiled binary variant. + + https://www.rodsbooks.com/refind/ + +if BR2_TARGET_REFIND_BIN + +config BR2_TARGET_REFIND_BIN_RENAME_TO_BOOT + bool "rename refind efi files to BOOT" + help + Move refind EFI directory to the default BOOT path. + +endif diff --git a/boot/refind-bin/readme.txt b/boot/refind-bin/readme.txt new file mode 100644 index 0000000000..d4bc326e6f --- /dev/null +++ b/boot/refind-bin/readme.txt @@ -0,0 +1,42 @@ +Notes on using rEFInd +============================================= + +1. Create a disk image + dd if=/dev/zero of=disk.img bs=1M count=32 +2. Partition it (either legacy or GPT style partitions work) + - Create one fat16 partition, labeled BOOT, flags boot, lba. + - Create one ext4 partition, type Linux, for the root fs. +3. Setup loop device and loop partitions + sudo losetup -f disk.img + sudo partx -a /dev/loop0 +4. Prepare the partition contents + sudo mkfs.fat -F 16 -L BOOT /dev/loop0p1 + sudo mkfs.ext4 -L root /dev/loop0p2 + sudo mount /dev/loop0p1 /mnt + sudo tar -C /mnt -xf output/images/refind.tar + sudo umount /mnt + sudo mount /dev/loop0p2 /mnt + sudo tar -C /mnt -xf output/images/rootfs.tar + sudo umount /mnt +5. Cleanup loop device + sudo partx -d /dev/loop0 + sudo losetup -d /dev/loop0 +6. Your disk.img is ready! + +Configuring rEFInd +============================================= + +rEFInd will search for refind_linux.conf files. + +Place a refind_linux.conf file in the same location as your initrd: + +"Boot Buildroot" "initrd=/boot/initrd-%v root=/dev/initrd ro earlyprintk" + +rEFInd will find all files with prefix initrd- and display options on screen, +defaulting to the most recent build version. + +Example contents of /boot: + +bzImage-buildroot-2022.05.1-104-1 +initrd-buildroot-2022.05.1-104-1 +refind_linux.conf diff --git a/boot/refind-bin/refind-bin.hash b/boot/refind-bin/refind-bin.hash new file mode 100644 index 0000000000..a03cc826e7 --- /dev/null +++ b/boot/refind-bin/refind-bin.hash @@ -0,0 +1,5 @@ +# Locally computed +sha256 44a981538cf06e683bc095e11694ce8508826fcc6ca6229e116938575e7c4c54 refind-bin-0.13.3.1.zip +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING.txt +sha256 cebbc60079d3e79a1d94bf7c63482ca27d8ce58739d28c5e209bbd378337729b LICENSE.txt +sha256 4748f03ed2dbcc14cde6ebc30799899c403e356a7465dc30fcf2b80c45fc0059 docs/refind/FDL-1.3.txt diff --git a/boot/refind-bin/refind-bin.mk b/boot/refind-bin/refind-bin.mk new file mode 100644 index 0000000000..bc806558cb --- /dev/null +++ b/boot/refind-bin/refind-bin.mk @@ -0,0 +1,63 @@ +################################################################################ +# +# refind-bin +# +################################################################################ + +REFIND_BIN_VERSION = 0.13.3.1 +REFIND_BIN_SITE = http://downloads.sourceforge.net/project/refind/$(REFIND_BIN_VERSION) +REFIND_BIN_SOURCE = refind-bin-$(REFIND_BIN_VERSION).zip +REFIND_BIN_LICENSE = GPL-3.0+, GFDL-1.3+ (docs) +REFIND_BIN_LICENSE_FILES = COPYING.txt LICENSE.txt docs/refind/FDL-1.3.txt +REFIND_BIN_INSTALL_IMAGES = YES + +ifeq ($(BR2_x86_64),y) +REFIND_BIN_ARCH = x86_64 +REFIND_BIN_PLATFORM = x64 +else ifeq ($(BR2_aarch64),y) +REFIND_BIN_ARCH = aarch64 +REFIND_BIN_PLATFORM = aa64 +else +REFIND_BIN_ARCH = ia32 +REFIND_BIN_PLATFORM = ia32 +endif + +REFIND_BIN_EFI_PART_DIR = $(BINARIES_DIR)/efi-part +REFIND_BIN_BINARIES_DIR = $(REFIND_BIN_EFI_PART_DIR)/EFI/refind + +REFIND_BIN_EXTRACT_CMDS = \ + bsdtar --strip-components=1 \ + -C $(REFIND_BIN_DIR) \ + $(TAR_OPTIONS) $(REFIND_BIN_DL_DIR)/$(REFIND_BIN_SOURCE) - + +define REFIND_BIN_INSTALL_IMAGES_CMDS + if [ -d $(REFIND_BIN_BINARIES_DIR) ]; then \ + rm -rf $(REFIND_BIN_BINARIES_DIR); \ + fi + $(INSTALL) -m 0755 -D $(@D)/refind/refind_$(REFIND_BIN_PLATFORM).efi \ + $(REFIND_BIN_BINARIES_DIR)/refind_$(REFIND_BIN_PLATFORM).efi + cp -r $(@D)/refind/drivers_$(REFIND_BIN_PLATFORM) \ + $(REFIND_BIN_BINARIES_DIR)/drivers_$(REFIND_BIN_PLATFORM) + echo "refind_$(REFIND_BIN_PLATFORM).efi,rEFInd Boot Manager,,Entry for rEFInd" > \ + $(REFIND_BIN_BINARIES_DIR)/BOOT.CSV + echo "# rEFInd configuration\ntimeout 20\n" > \ + $(REFIND_BIN_BINARIES_DIR)/refind.conf + cp -r $(@D)/refind/icons $(REFIND_BIN_BINARIES_DIR)/icons + cp -r $(@D)/{fonts,banners,keys} $(REFIND_BIN_BINARIES_DIR)/ +endef + +ifeq ($(BR2_TARGET_REFIND_BIN_RENAME_TO_BOOT),y) +define REFIND_BIN_IMAGES_RENAME_TO_BOOT + if [ -d $(REFIND_BIN_EFI_PART_DIR)/EFI/BOOT ]; then \ + rm -rf $(REFIND_BIN_EFI_PART_DIR)/EFI/BOOT; \ + fi + mv $(REFIND_BIN_BINARIES_DIR)/ $(REFIND_BIN_EFI_PART_DIR)/EFI/BOOT/ + mv $(REFIND_BIN_EFI_PART_DIR)/EFI/BOOT/refind_$(REFIND_BIN_PLATFORM).efi \ + $(REFIND_BIN_EFI_PART_DIR)/EFI/BOOT/BOOT$(REFIND_BIN_PLATFORM).EFI + echo "BOOT$(REFIND_BIN_PLATFORM).EFI,rEFInd Boot Manager,,Entry for rEFInd" > \ + $(REFIND_BIN_EFI_PART_DIR)/EFI/BOOT/BOOT.CSV +endef +REFIND_BIN_POST_INSTALL_IMAGES_HOOKS += REFIND_BIN_IMAGES_RENAME_TO_BOOT +endif + +$(eval $(generic-package)) From f6e8b99ababe7cd183d93991c323f8880e4cd170 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Thu, 29 Feb 2024 16:39:46 -0800 Subject: [PATCH 79/92] package/irqbalance: update to latest 20240229 version Fixes: https://www.github.com/irqbalance/irqbalance/issues/292 No new release has been made with this fix, so update to the latest commit hash as of 20240229. Signed-off-by: Christian Stewart --- package/irqbalance/irqbalance.hash | 2 +- package/irqbalance/irqbalance.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/irqbalance/irqbalance.hash b/package/irqbalance/irqbalance.hash index bf33e71e48..9802c9b8a7 100644 --- a/package/irqbalance/irqbalance.hash +++ b/package/irqbalance/irqbalance.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 8d698799251ea8518f342f36be26f2f092df51189f6777db33116d40cf0dae6c irqbalance-1.9.3.tar.gz +sha256 2c7a35db1b6b012c712e2ae9694adcb4fac81a82dda462be02e5d9656f37695b irqbalance-64285577b465c4c5d8b5bbfa0120432e1d5ffd63.tar.gz sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/irqbalance/irqbalance.mk b/package/irqbalance/irqbalance.mk index 5d1bd48002..7a434d10be 100644 --- a/package/irqbalance/irqbalance.mk +++ b/package/irqbalance/irqbalance.mk @@ -4,8 +4,8 @@ # ################################################################################ -IRQBALANCE_VERSION = 1.9.3 -IRQBALANCE_SITE = $(call github,irqbalance,irqbalance,v$(IRQBALANCE_VERSION)) +IRQBALANCE_VERSION = 64285577b465c4c5d8b5bbfa0120432e1d5ffd63 +IRQBALANCE_SITE = $(call github,irqbalance,irqbalance,$(IRQBALANCE_VERSION)) IRQBALANCE_LICENSE = GPL-2.0 IRQBALANCE_LICENSE_FILES = COPYING IRQBALANCE_SELINUX_MODULES = irqbalance From ccffe8ec3fed2f0c519033ae324ba97365f4ccb7 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Mon, 22 Feb 2021 04:32:09 -0800 Subject: [PATCH 80/92] package/rtl8821au: update to latest commit 455e6e Signed-off-by: Christian Stewart --- package/rtl8821au/rtl8821au.hash | 2 +- package/rtl8821au/rtl8821au.mk | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/package/rtl8821au/rtl8821au.hash b/package/rtl8821au/rtl8821au.hash index 56e5609ebd..3569d2d000 100644 --- a/package/rtl8821au/rtl8821au.hash +++ b/package/rtl8821au/rtl8821au.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 fde8ca9735a6c9c4c907fb6f565185a59b04bcfa78feb2309941cc09d49c4ac7 rtl8821au-8ea0ed9da764448c7310a27744ab5814289f35a8.tar.gz +sha256 1df62143790caa9807bae4c1d37ba901608f8f2da2daeb7ebbf4d2eff7c0abd1 rtl8821au-455e6e4c8a288767b399296da1eeb13eafa70f2b.tar.gz sha256 640d90f6ee401241ff62834d0d1b33f83049e99b8bfdfa04ed1b0a1635dde3e7 LICENSE diff --git a/package/rtl8821au/rtl8821au.mk b/package/rtl8821au/rtl8821au.mk index 9a92696437..3d12d683ea 100644 --- a/package/rtl8821au/rtl8821au.mk +++ b/package/rtl8821au/rtl8821au.mk @@ -4,8 +4,9 @@ # ################################################################################ -RTL8821AU_VERSION = 8ea0ed9da764448c7310a27744ab5814289f35a8 +RTL8821AU_VERSION = 455e6e4c8a288767b399296da1eeb13eafa70f2b RTL8821AU_SITE = $(call github,lwfinger,rtl8812au,$(RTL8821AU_VERSION)) + RTL8821AU_LICENSE = GPL-2.0 RTL8821AU_LICENSE_FILES = LICENSE @@ -18,7 +19,10 @@ define RTL8821AU_LINUX_CONFIG_FIXUPS endef RTL8821AU_MODULE_MAKE_OPTS = \ - CONFIG_RTL8812AU_8821AU=m \ + CONFIG_RTL8812A=y \ + CONFIG_RTL8821A=y \ + CONFIG_RTL8814A=n \ + CONFIG_RTL8812AU=m \ KVER=$(LINUX_VERSION_PROBED) \ USER_EXTRA_CFLAGS="-DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN \ -Wno-error" From c16760e244d976fce41f41e7391fbd8956131f1e Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Wed, 27 Dec 2023 15:04:33 -0800 Subject: [PATCH 81/92] package/rtl8812au-aircrack-ng: ignore implicit-int warning Signed-off-by: Christian Stewart --- package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk index 3a7c56a3fc..a64d671e95 100644 --- a/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk +++ b/package/rtl8812au-aircrack-ng/rtl8812au-aircrack-ng.mk @@ -15,7 +15,8 @@ RTL8812AU_AIRCRACK_NG_EXTRA_CFLAGS = \ -DRTW_USE_CFG80211_STA_EVENT \ -Wno-error=address \ -Wno-error=array-bounds \ - -Wno-error=cast-function-type + -Wno-error=cast-function-type \ + -Wno-error=implicit-int RTL8812AU_AIRCRACK_NG_MODULE_MAKE_OPTS = \ CONFIG_PLATFORM_I386_PC=n \ From 7fc5c98c40595aefa97ce5ef213712b1e61f654c Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Tue, 22 Jun 2021 02:18:49 +0000 Subject: [PATCH 82/92] [SKIFF] package/go: use host compiler when go-bootstrap unsupported All Go compiler versions > 1.4.x (old) are written in Go, and require a existing compiled Go version to use to build from source. https://golang.org/doc/install/source#bootstrapFromSource The process for "bootstrapping" the Go compiler in Buildroot is: 1. Compile a C/C++ cross-compiler (gcc) as the host toolchain. 2. Build go-bootstrap-stage1 (which is Go 1.4.x and written in C) 3. Build go-bootstrap-stage2 (which is Go 1.19.x and written in Go) 4. Build go-bootstrap-stage3 (which is Go 1.21.x and written in Go) 5. Build go-src (written in Go) using go-bootstrap-stage3. go-bootstrap-stage1 does not work on 64-bit arm. The Go 1.4.x bootstrap compiler is compatible with x86, x86_64, and arm (32 bit) only. This patch adds a fallback to require a host Go compiler to build host-go-src when BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE3_ARCH_SUPPORTS is not set. Recent changes added go-src with the intent of adding go-bin later. This commit changes go-src to depend on the host Go compiler to bootstrap go-src on architectures that cannot build go-bootstrap-stage1 (such as arm64). Signed-off-by: Christian Stewart --- changes prior to inclusion in this series: - thanks Thomas for the review & suggestions - added NEEDS_HOST_GO boolean - added dependency checks to support/dependencies/dependencies.sh - removed unnecessary changes to go-bootstrap package - add dependency on toolchain if Cgo is enabled - updates for go1.20 - updates for go-bootstrap-stage{1,2} changes from v1 -> v2: - remove whitespace fix in bootstrap stage2 changes from v2 -> v3: - rebase changes from v7 -> v8: - rebase on go-src changes - Discussion related to adding go-src and go-bin: - https://patchwork.ozlabs.org/project/buildroot/patch/20230711220849.1702358-4-christian@aperture.us/ changes from v8 -> v9: - fixed HOST_GO_... to HOST_GO_SRC... changes from v9 -> v10: - upstream merged go-bin rejecting this series - however, building on arm64 hosts still fails. - this patch restores the proposed behavior. Signed-off-by: Christian Stewart --- Config.in | 4 ++++ package/go/Config.in.host | 7 ++----- package/go/go-src/go-src.mk | 12 ++++++++---- support/dependencies/dependencies.sh | 4 ++++ 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/Config.in b/Config.in index 1970a0db24..f5ab4485e7 100644 --- a/Config.in +++ b/Config.in @@ -77,6 +77,10 @@ config BR2_HOST_GCC_AT_LEAST_11 # When adding new entries above, be sure to update # the HOSTCC_MAX_VERSION variable in the Makefile. +# Hidden boolean selected if bootstrapping Go w/ GCC is not supported. +config BR2_NEEDS_HOST_GO + bool + # Hidden boolean selected by packages in need of Java in order to build # (example: kodi) config BR2_NEEDS_HOST_JAVA diff --git a/package/go/Config.in.host b/package/go/Config.in.host index 7e354b3298..8b6ba67ff8 100644 --- a/package/go/Config.in.host +++ b/package/go/Config.in.host @@ -2,7 +2,6 @@ config BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS bool default y - depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE3_ARCH_SUPPORTS # See https://go.dev/doc/install/source#environment # See src/go/build/syslist.go for the list of supported architectures depends on (BR2_arm && BR2_TOOLCHAIN_SUPPORTS_PIE) || BR2_aarch64 \ @@ -34,7 +33,6 @@ config BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS config BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS bool default y - depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE3_ARCH_SUPPORTS || BR2_PACKAGE_HOST_GO_BIN_HOST_ARCH_SUPPORTS # CGO linking for the host. Since we use the same compiler for target # and host, if the target can't do CGO linking, then the host can't. @@ -57,8 +55,7 @@ if BR2_PACKAGE_HOST_GO choice prompt "Go compiler variant" - default BR2_PACKAGE_HOST_GO_SRC if BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE3_ARCH_SUPPORTS - default BR2_PACKAGE_HOST_GO_BIN if BR2_PACKAGE_HOST_GO_BIN_HOST_ARCH_SUPPORTS + default BR2_PACKAGE_HOST_GO_SRC help Select a Go compiler variant. @@ -66,7 +63,7 @@ choice config BR2_PACKAGE_HOST_GO_SRC bool "host go (source)" - depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE3_ARCH_SUPPORTS + select BR2_NEEDS_HOST_GO if !BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE3_ARCH_SUPPORTS help This package will build the go compiler for the host. diff --git a/package/go/go-src/go-src.mk b/package/go/go-src/go-src.mk index 340aada94c..4207596050 100644 --- a/package/go/go-src/go-src.mk +++ b/package/go/go-src/go-src.mk @@ -13,9 +13,7 @@ GO_SRC_LICENSE_FILES = LICENSE GO_SRC_CPE_ID_VENDOR = golang HOST_GO_SRC_PROVIDES = host-go -HOST_GO_SRC_DEPENDENCIES = \ - host-go-bootstrap-stage3 \ - $(HOST_GO_DEPENDENCIES_CGO) +HOST_GO_SRC_DEPENDENCIES = $(HOST_GO_DEPENDENCIES_CGO) ifeq ($(BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS),y) @@ -35,7 +33,6 @@ endif HOST_GO_SRC_MAKE_ENV = \ GO111MODULE=off \ GOCACHE=$(HOST_GO_HOST_CACHE) \ - GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE3_ROOT) \ GOROOT_FINAL=$(HOST_GO_ROOT) \ GOROOT="$(@D)" \ GOBIN="$(@D)/bin" \ @@ -45,6 +42,13 @@ HOST_GO_SRC_MAKE_ENV = \ CGO_ENABLED=$(HOST_GO_CGO_ENABLED) \ $(HOST_GO_SRC_CROSS_ENV) +# Use the Go compiler bootstrapped by Buildroot if available. +# Otherwise, use the host Go compiler. +ifeq ($(BR2_PACKAGE_HOST_GO_BOOTSTRAP_STAGE3_ARCH_SUPPORTS),y) +HOST_GO_SRC_DEPENDENCIES += host-go-bootstrap-stage3 +HOST_GO_SRC_MAKE_ENV += GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_STAGE3_ROOT) +endif + define HOST_GO_SRC_BUILD_CMDS cd $(@D)/src && \ $(HOST_GO_SRC_MAKE_ENV) ./make.bash $(if $(VERBOSE),-v) diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh index fb0defd0c9..118556361a 100755 --- a/support/dependencies/dependencies.sh +++ b/support/dependencies/dependencies.sh @@ -217,6 +217,10 @@ if grep -q ^BR2_NEEDS_HOST_UTF8_LOCALE=y $BR2_CONFIG ; then fi fi +if grep -q ^BR2_NEEDS_HOST_GO=y $BR2_CONFIG ; then + check_prog_host "go" +fi + if grep -q ^BR2_NEEDS_HOST_JAVA=y $BR2_CONFIG ; then check_prog_host "java" JAVA_GCJ=$(java -version 2>&1 | grep gcj) From 7f400c4b76a61f52944dc8d59f2703c49ef15270 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 28 Oct 2024 10:15:06 -0600 Subject: [PATCH 83/92] package/pkg-golang.mk: make GOPROXY configurable BR2_GOPROXY now configures the Go module proxy URL used to download Go modules specified in project go.mod and go.sum files. By default, it uses Google's official Go module mirror at proxy.golang.org, falling back to direct downloads if the module is not found in the mirror. This change sets the default GOPROXY value to match Go's built-in default of "https://proxy.golang.org,direct" which provides several benefits: - Avoid package breakages due to missing module sources - Better alignment with upstream Go toolchain defaults - Faster downloads via the proxy compared to direct Git clones - Maintains reproducible builds through Go's module checksum validation The default value from the toolchain can be read with "go env GOPROXY" We rely on package developers to audit their dependencies in go.mod and go.sum. The value can be configured to: - A comma-separated list of proxy URLs - "off" to disable all downloads - "direct" to download directly from source repositories For more details on Go module proxies: https://go.dev/ref/mod#module-proxy Discussion: https://lore.kernel.org/all/CADvTj4pXO2rwJ8oCzzGNY+OxLuo3uJnDT2PAxbyquw0L6dhfiA@mail.gmail.com/T/#t Signed-off-by: James Hilliard Signed-off-by: Christian Stewart --- v1 -> v2: - added more context and links - renamed to GOPROXY instead of GOPROXY_LIST - moved into the !BR2_PRIMARY_SITE_ONLY section --- Config.in | 16 ++++++++++++++++ package/pkg-golang.mk | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/Config.in b/Config.in index f5ab4485e7..4afff1741e 100644 --- a/Config.in +++ b/Config.in @@ -321,6 +321,22 @@ config BR2_GNU_MIRROR http://ftp.gnu.org/pub/gnu http://mirror.aarnet.edu.au/pub/gnu +config BR2_GOPROXY + string "Go module proxy" + default "https://proxy.golang.org,direct" + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + help + The Go module proxy URL used to download Go modules. By default, + it uses the official Go module mirror, falling back to direct + downloads if the module is not found in the mirror. + + The value can be one of: + - Comma-separated list of proxy URLs + - "off" to disable all downloads + - "direct" to download directly from source repositories + + See https://go.dev/ref/mod#module-proxy + config BR2_LUAROCKS_MIRROR string "LuaRocks mirror" default "http://rocks.moonscript.org" diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk index 33cf9bfb1a..9b70e9553d 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -88,7 +88,7 @@ $(2)_POST_PATCH_HOOKS += $(2)_GEN_GOMOD $(2)_DOWNLOAD_POST_PROCESS = go $(2)_DL_ENV += \ $$(HOST_GO_COMMON_ENV) \ - GOPROXY=direct \ + GOPROXY=$$(call qstrip,$$(BR2_GOPROXY)) \ $$($(2)_GO_ENV) # Because we append vendored info, we can't rely on the values being empty From ad92e2f9125f5fde7a8c7a39281f7d130ba158df Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Mon, 22 May 2023 13:02:37 -0700 Subject: [PATCH 84/92] package/tini: configure libpod with init-path Signed-off-by: Christian Stewart --- package/tini/tini.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/tini/tini.mk b/package/tini/tini.mk index 83e86237d4..33f1ed2bf4 100644 --- a/package/tini/tini.mk +++ b/package/tini/tini.mk @@ -33,6 +33,11 @@ define TINI_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0755 $(@D)/bin/tini $(TARGET_DIR)/usr/bin/tini mkdir -p $(TARGET_DIR)/usr/libexec/docker ln -sf ../../bin/tini $(TARGET_DIR)/usr/libexec/docker/docker-init + mkdir -p $(TARGET_DIR)/usr/share/containers + touch $(TARGET_DIR)/usr/share/containers/libpod.conf + sed -i '/init_path/d' $(TARGET_DIR)/usr/share/containers/libpod.conf && \ + echo 'init_path = "/usr/libexec/docker/docker-init"' >> \ + $(TARGET_DIR)/usr/share/containers/libpod.conf endef # Tini's CMakeLists.txt is not suitable for Buildroot. From 08cb85e870f022f9f24fa27dca4a2fe5bfc5de07 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Wed, 26 Oct 2022 11:38:11 -0700 Subject: [PATCH 85/92] package/docker-engine: add netcgo build tag Force Docker Engine to use the C DNS resolver. Fixes some issues related to the Go DNS resolver. Signed-off-by: Christian Stewart --- package/docker-engine/docker-engine.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/docker-engine/docker-engine.mk b/package/docker-engine/docker-engine.mk index ba4e7a4ae0..85a3f9195e 100644 --- a/package/docker-engine/docker-engine.mk +++ b/package/docker-engine/docker-engine.mk @@ -23,7 +23,7 @@ DOCKER_ENGINE_LDFLAGS = \ -X $(DOCKER_ENGINE_GOMOD)/dockerversion.InitCommitID="" \ -X $(DOCKER_ENGINE_GOMOD)/dockerversion.Version="$(DOCKER_ENGINE_VERSION)" -DOCKER_ENGINE_TAGS = cgo exclude_graphdriver_zfs +DOCKER_ENGINE_TAGS = cgo netcgo exclude_graphdriver_zfs DOCKER_ENGINE_BUILD_TARGETS = cmd/dockerd cmd/docker-proxy ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y) From 5aae5d14b2777cf3901e6419e2780be0fc51e77c Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Tue, 17 Nov 2020 22:23:39 -0800 Subject: [PATCH 86/92] package/docker-engine: increase containerd startup timeout period Signed-off-by: Christian Stewart --- ...crease-timeouts-for-containerd-start.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 package/docker-engine/0001-libcontainerd-increase-timeouts-for-containerd-start.patch diff --git a/package/docker-engine/0001-libcontainerd-increase-timeouts-for-containerd-start.patch b/package/docker-engine/0001-libcontainerd-increase-timeouts-for-containerd-start.patch new file mode 100644 index 0000000000..a8f1f1c4f9 --- /dev/null +++ b/package/docker-engine/0001-libcontainerd-increase-timeouts-for-containerd-start.patch @@ -0,0 +1,35 @@ +From 5cb345e7ccb53290681c060cdf0d75a244a4ccb3 Mon Sep 17 00:00:00 2001 +From: Christian Stewart +Date: Tue, 17 Nov 2020 22:21:33 -0800 +Subject: [PATCH] libcontainerd: increase timeouts for containerd startup + +Fixes startup error "timeout waiting for containerd to start" on some systems +with slow I/O. + +Signed-off-by: Christian Stewart +--- + libcontainerd/supervisor/remote_daemon.go | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/libcontainerd/supervisor/remote_daemon.go b/libcontainerd/supervisor/remote_daemon.go +index 3538612246..7dfdbdbe0e 100644 +--- a/libcontainerd/supervisor/remote_daemon.go ++++ b/libcontainerd/supervisor/remote_daemon.go +@@ -22,10 +22,10 @@ import ( + ) + + const ( +- maxConnectionRetryCount = 3 +- healthCheckTimeout = 3 * time.Second +- shutdownTimeout = 15 * time.Second +- startupTimeout = 15 * time.Second ++ maxConnectionRetryCount = 4 ++ healthCheckTimeout = 6 * time.Second ++ shutdownTimeout = 15 * time.Second ++ startupTimeout = 60 * time.Second + configFile = "containerd.toml" + binaryName = "containerd" + pidFile = "containerd.pid" +-- +2.29.2 + From 09c7b3a1e5dadcc36b98ad327dc519d9d04eaf39 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Sun, 2 May 2021 19:19:27 -0700 Subject: [PATCH 87/92] package/genuinetools-img: new host and target package Img is a standalone, daemon-less, unprivileged Dockerfile and OCI compatible container image builder. It uses the moby-buildkit solver internally. The commands/UX mirror the Docker CLI for workflow compatibility. Using the genuinetools- prefix due to the generic nature of the "img" name. Adds both host and target variants. fuse-overlayfs can be used as an unprivileged and rootless overlay filesystem backend. https://github.com/genuinetools/img Signed-off-by: Christian Stewart --- TODO: https://patchwork.ozlabs.org/project/buildroot/patch/20210516010521.1375959-1-christian@aperture.us/ - changes to patch to add libfuse3 as host package requested. --- package/Config.in | 1 + package/Config.in.host | 1 + package/genuinetools-img/Config.in | 23 ++++++++++++++++ package/genuinetools-img/Config.in.host | 9 +++++++ .../genuinetools-img/genuinetools-img.hash | 3 +++ package/genuinetools-img/genuinetools-img.mk | 27 +++++++++++++++++++ 6 files changed, 64 insertions(+) create mode 100644 package/genuinetools-img/Config.in create mode 100644 package/genuinetools-img/Config.in.host create mode 100644 package/genuinetools-img/genuinetools-img.hash create mode 100644 package/genuinetools-img/genuinetools-img.mk diff --git a/package/Config.in b/package/Config.in index dac1fc568d..29f0685de5 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2836,6 +2836,7 @@ menu "System tools" source "package/emlog/Config.in" source "package/fluent-bit/Config.in" source "package/ftop/Config.in" + source "package/genuinetools-img/Config.in" source "package/getent/Config.in" source "package/gkrellm/Config.in" source "package/htop/Config.in" diff --git a/package/Config.in.host b/package/Config.in.host index 69e48fb878..b76ba00ec5 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -45,6 +45,7 @@ menu "Host utilities" source "package/genext2fs/Config.in.host" source "package/genimage/Config.in.host" source "package/genpart/Config.in.host" + source "package/genuinetools-img/Config.in.host" source "package/gnupg/Config.in.host" source "package/gnupg2/Config.in.host" source "package/go/Config.in.host" diff --git a/package/genuinetools-img/Config.in b/package/genuinetools-img/Config.in new file mode 100644 index 0000000000..eb4992db07 --- /dev/null +++ b/package/genuinetools-img/Config.in @@ -0,0 +1,23 @@ +config BR2_PACKAGE_GENUINETOOLS_IMG + bool "genuinetools-img" + depends on BR2_USE_MMU # fuse-overlayfs libfuse3 + depends on !BR2_STATIC_LIBS # fuse-overlayfs libfuse3 + depends on BR2_TOOLCHAIN_HAS_THREADS # fuse-overlayfs libfuse3 + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 # fuse-overlayfs + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_TOOLCHAIN_USES_UCLIBC + select BR2_PACKAGE_CGROUPFS_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime dependency + select BR2_PACKAGE_FUSE_OVERLAYFS # runtime dependency + select BR2_PACKAGE_LIBFUSE3 # fuse-overlayfs + help + Img is a standalone, daemon-less, unprivileged Dockerfile + and OCI compatible container image builder. + + https://github.com/genuinetools/img + +comment "genuinetools-img needs a toolchain w/ threads, dynamic library, headers >= 3.15" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 diff --git a/package/genuinetools-img/Config.in.host b/package/genuinetools-img/Config.in.host new file mode 100644 index 0000000000..bbef88acf6 --- /dev/null +++ b/package/genuinetools-img/Config.in.host @@ -0,0 +1,9 @@ +config BR2_PACKAGE_HOST_GENUINETOOLS_IMG + bool "host genuinetools-img" + depends on BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_FUSE_OVERLAYFS # runtime dependency + help + Img is a standalone, daemon-less, unprivileged Dockerfile + and OCI compatible container image builder. + + https://github.com/genuinetools/img diff --git a/package/genuinetools-img/genuinetools-img.hash b/package/genuinetools-img/genuinetools-img.hash new file mode 100644 index 0000000000..6610d34eea --- /dev/null +++ b/package/genuinetools-img/genuinetools-img.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 c6d805ab899db639fa08f0e33fe6673593be8336d288bb1cb4cb81a3229a916f genuinetools-img-0.5.11-go2.tar.gz +sha256 c696614021eafe355c7fb0af3e724fc7fa8729a0c10c27cbed2505bf30a853ce LICENSE diff --git a/package/genuinetools-img/genuinetools-img.mk b/package/genuinetools-img/genuinetools-img.mk new file mode 100644 index 0000000000..08330d1113 --- /dev/null +++ b/package/genuinetools-img/genuinetools-img.mk @@ -0,0 +1,27 @@ +################################################################################ +# +# genuinetools-img +# +################################################################################ + +GENUINETOOLS_IMG_VERSION = 0.5.11 +GENUINETOOLS_IMG_SITE = $(call github,genuinetools,img,v$(GENUINETOOLS_IMG_VERSION)) + +GENUINETOOLS_IMG_LICENSE = MIT +GENUINETOOLS_IMG_LICENSE_FILES = LICENSE + +GENUINETOOLS_IMG_DEPENDENCIES = host-pkgconf +GENUINETOOLS_IMG_GOMOD = github.com/genuinetools/img + +GENUINETOOLS_IMG_TAGS = cgo noembed +GENUINETOOLS_IMG_LDFLAGS = \ + -X $(GENUINETOOLS_IMG_GOMOD)/version.VERSION="$(GENUINETOOLS_IMG_VERSION)" + +HOST_GENUINETOOLS_IMG_TAGS = $(GENUINETOOLS_IMG_TAGS) +HOST_GENUINETOOLS_IMG_LDFLAGS = $(GENUINETOOLS_IMG_LDFLAGS) + +HOST_GENUINETOOLS_IMG_BIN_NAME = genuinetools-img +HOST_GENUINETOOLS_IMG_INSTALL_BINS = $(HOST_GENUINETOOLS_IMG_BIN_NAME) + +$(eval $(golang-package)) +$(eval $(host-golang-package)) From 3303b2581f2fd8ec510420ab2726a85e1831d7b2 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Sun, 24 Jan 2021 02:20:30 -0800 Subject: [PATCH 88/92] package/daemonize: new package Daemonize is a command line utility to run a program as a Unix daemon. Signed-off-by: Christian Stewart --- TODO: Changes requested for v2: https://patchwork.ozlabs.org/project/buildroot/patch/20210124102241.1207866-1-christian@paral.in/ --- package/Config.in | 1 + ...de-setpgrp-to-enable-cross-compiling.patch | 55 +++++++++++++++++++ package/daemonize/Config.in | 4 ++ package/daemonize/daemonize.hash | 1 + package/daemonize/daemonize.mk | 12 ++++ 5 files changed, 73 insertions(+) create mode 100644 package/daemonize/0001-configure-override-setpgrp-to-enable-cross-compiling.patch create mode 100644 package/daemonize/Config.in create mode 100644 package/daemonize/daemonize.hash create mode 100644 package/daemonize/daemonize.mk diff --git a/package/Config.in b/package/Config.in index 29f0685de5..9129d4abc8 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2821,6 +2821,7 @@ menu "System tools" source "package/criu/Config.in" source "package/crun/Config.in" source "package/daemon/Config.in" + source "package/daemonize/Config.in" source "package/dc3dd/Config.in" source "package/dcron/Config.in" source "package/ddrescue/Config.in" diff --git a/package/daemonize/0001-configure-override-setpgrp-to-enable-cross-compiling.patch b/package/daemonize/0001-configure-override-setpgrp-to-enable-cross-compiling.patch new file mode 100644 index 0000000000..fd544f0441 --- /dev/null +++ b/package/daemonize/0001-configure-override-setpgrp-to-enable-cross-compiling.patch @@ -0,0 +1,55 @@ +From db172f4d7028c648f66f3c1db6202e6a5d62636d Mon Sep 17 00:00:00 2001 +From: Christian Stewart +Date: Sun, 24 Jan 2021 02:16:36 -0800 +Subject: [PATCH] configure: override setpgrp to enable cross-compiling + +Signed-off-by: Christian Stewart +--- + configure | 30 +----------------------------- + 1 file changed, 1 insertion(+), 29 deletions(-) + +diff --git a/configure b/configure +index ab7c0d4..209e165 100755 +--- a/configure ++++ b/configure +@@ -4147,36 +4147,8 @@ fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether setpgrp takes no argument" >&5 + $as_echo_n "checking whether setpgrp takes no argument... " >&6; } +-if ${ac_cv_func_setpgrp_void+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- if test "$cross_compiling" = yes; then : +- as_fn_error $? "cannot check setpgrp when cross compiling" "$LINENO" 5 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-$ac_includes_default +-int +-main () +-{ +-/* If this system has a BSD-style setpgrp which takes arguments, +- setpgrp(1, 1) will fail with ESRCH and return -1, in that case +- exit successfully. */ +- return setpgrp (1,1) != -1; +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_run "$LINENO"; then : +- ac_cv_func_setpgrp_void=no +-else +- ac_cv_func_setpgrp_void=yes +-fi +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +- conftest.$ac_objext conftest.beam conftest.$ac_ext +-fi ++ac_cv_func_setpgrp_void=yes + +-fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_setpgrp_void" >&5 + $as_echo "$ac_cv_func_setpgrp_void" >&6; } + if test $ac_cv_func_setpgrp_void = yes; then +-- +2.30.0 + diff --git a/package/daemonize/Config.in b/package/daemonize/Config.in new file mode 100644 index 0000000000..6c38a7a4a4 --- /dev/null +++ b/package/daemonize/Config.in @@ -0,0 +1,4 @@ +menuconfig BR2_PACKAGE_DAEMONIZE + bool "daemonize" + help + Command line utility to run a daemon. diff --git a/package/daemonize/daemonize.hash b/package/daemonize/daemonize.hash new file mode 100644 index 0000000000..8bf58e96f4 --- /dev/null +++ b/package/daemonize/daemonize.hash @@ -0,0 +1 @@ +sha256 20c4fc9925371d1ddf1b57947f8fb93e2036eb9ccc3b43a1e3678ea8471c4c60 daemonize-1.7.8.tar.gz diff --git a/package/daemonize/daemonize.mk b/package/daemonize/daemonize.mk new file mode 100644 index 0000000000..9a86ae95d5 --- /dev/null +++ b/package/daemonize/daemonize.mk @@ -0,0 +1,12 @@ +################################################################################ +# +# daemonize +# +################################################################################ + +DAEMONIZE_VERSION = 1.7.8 +DAEMONIZE_SITE = $(call github,bmc,daemonize,release-$(DAEMONIZE_VERSION)) +DAEMONIZE_LICENSE = BSD-3-Clause +DAEMONIZE_LICENSE_FILES = LICENSE.md + +$(eval $(autotools-package)) From 2f0031e33e5cc498b21b816dd4c3e6733d399370 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Wed, 26 Jan 2022 19:35:00 -0800 Subject: [PATCH 89/92] package/buildah: new package Adds both host and target packages for buildah. Buildah is a tool that facilitates building OCI images. https://github.com/containers/buildah The buildah tree does not ship with a default policy.json file, and instead relies on packagers to provide one. A patch is added to create a basic barebones policy.json which is installed to /etc/containers/policy.json with a hook. Signed-off-by: Christian Stewart --- v1 -> v2: - add package to developers - add host runc dependency for host package - add libgpgme runtime dependency v2 -> v3: - add policy.json to target: required by some commands - example: buildah pull docker.io/library/alpine - pull: tested on raspberry pi 4 v3 -> v4: - TODO: move policy.json to package dir - https://lists.buildroot.org/pipermail/buildroot/2022-January/634936.html - bump to version v1.32.1 - https://github.com/containers/buildah/releases/tag/v1.32.1 v4 -> v5: - bump to version 1.35.x Signed-off-by: Christian Stewart --- DEVELOPERS | 1 + package/Config.in | 1 + package/Config.in.host | 1 + ...01-contrib-add-buildroot-policy-json.patch | 38 +++++++++++++++ package/buildah/Config.in | 23 ++++++++++ package/buildah/Config.in.host | 8 ++++ package/buildah/buildah.hash | 3 ++ package/buildah/buildah.mk | 46 +++++++++++++++++++ 8 files changed, 121 insertions(+) create mode 100644 package/buildah/0001-contrib-add-buildroot-policy-json.patch create mode 100644 package/buildah/Config.in create mode 100644 package/buildah/Config.in.host create mode 100644 package/buildah/buildah.hash create mode 100644 package/buildah/buildah.mk diff --git a/DEVELOPERS b/DEVELOPERS index a181a40e31..a6e0c918dc 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -622,6 +622,7 @@ N: Christian Stewart F: boot/refind/ F: package/balena-engine/ F: package/batman-adv/ +F: package/buildah/ F: package/catatonit/ F: package/cni-plugins/ F: package/conmon/ diff --git a/package/Config.in b/package/Config.in index 9129d4abc8..c210ac21e4 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2811,6 +2811,7 @@ menu "System tools" source "package/audit/Config.in" source "package/balena-engine/Config.in" source "package/bubblewrap/Config.in" + source "package/buildah/Config.in" source "package/cgroupfs-mount/Config.in" source "package/circus/Config.in" source "package/conmon/Config.in" diff --git a/package/Config.in.host b/package/Config.in.host index b76ba00ec5..e1dbdf2151 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -13,6 +13,7 @@ menu "Host utilities" source "package/bmap-writer/Config.in.host" source "package/bootgen/Config.in.host" source "package/btrfs-progs/Config.in.host" + source "package/buildah/Config.in.host" source "package/cbootimage/Config.in.host" source "package/checkpolicy/Config.in.host" source "package/checksec/Config.in.host" diff --git a/package/buildah/0001-contrib-add-buildroot-policy-json.patch b/package/buildah/0001-contrib-add-buildroot-policy-json.patch new file mode 100644 index 0000000000..7a8ca57a5e --- /dev/null +++ b/package/buildah/0001-contrib-add-buildroot-policy-json.patch @@ -0,0 +1,38 @@ +From 6808cfa788f03fca36a41202d9475ee5bc9feac7 Mon Sep 17 00:00:00 2001 +From: Christian Stewart +Date: Wed, 26 Jan 2022 22:07:09 -0800 +Subject: [PATCH] contrib: add buildroot policy json + +Buildah does not ship a default policy.json in-tree. + +Signed-off-by: Christian Stewart +--- + contrib/buildroot/policy.json | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + create mode 100644 contrib/buildroot/policy.json + +diff --git a/contrib/buildroot/policy.json b/contrib/buildroot/policy.json +new file mode 100644 +index 00000000..d8c638a0 +--- /dev/null ++++ b/contrib/buildroot/policy.json +@@ -0,0 +1,16 @@ ++{ ++ "default": [ ++ { ++ "type": "insecureAcceptAnything" ++ } ++ ], ++ "transports": { ++ "docker-daemon": { ++ "": [ ++ { ++ "type": "insecureAcceptAnything" ++ } ++ ] ++ } ++ } ++} +-- +2.35.0 + diff --git a/package/buildah/Config.in b/package/buildah/Config.in new file mode 100644 index 0000000000..05bd0eec31 --- /dev/null +++ b/package/buildah/Config.in @@ -0,0 +1,23 @@ +config BR2_PACKAGE_BUILDAH + bool "buildah" + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgpgme -> libgpg-error + depends on BR2_TOOLCHAIN_HAS_THREADS # runc + depends on BR2_USE_MMU # libgpgme -> libassuan + depends on !BR2_TOOLCHAIN_USES_UCLIBC # runc -> no fexecve + # gnupg and runc are not needed to build, but at runtime. + select BR2_PACKAGE_LIBGPGME + select BR2_PACKAGE_GNUPG if !BR2_PACKAGE_GNUPG2 + select BR2_PACKAGE_LIBGPG_ERROR + select BR2_PACKAGE_LIBASSUAN + select BR2_PACKAGE_RUNC + help + Buildah is a tool that facilitates building OCI images. + + https://github.com/containers/buildah + +comment "buildah needs a glibc or musl toolchain w/ threads" + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS && \ + BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_UCLIBC diff --git a/package/buildah/Config.in.host b/package/buildah/Config.in.host new file mode 100644 index 0000000000..67fee6d7ac --- /dev/null +++ b/package/buildah/Config.in.host @@ -0,0 +1,8 @@ +config BR2_PACKAGE_HOST_BUILDAH + bool "host buildah" + depends on BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS + select BR2_PACKAGE_HOST_RUNC + help + Buildah is a tool that facilitates building OCI images. + + https://github.com/containers/buildah diff --git a/package/buildah/buildah.hash b/package/buildah/buildah.hash new file mode 100644 index 0000000000..13934ee47d --- /dev/null +++ b/package/buildah/buildah.hash @@ -0,0 +1,3 @@ +# Locally calculated +sha256 7d655453d6ff150503a4ecd61481622d83735f89fc69cf1805f0d3a1619c8c2c buildah-1.35.4-go2.tar.gz +sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE diff --git a/package/buildah/buildah.mk b/package/buildah/buildah.mk new file mode 100644 index 0000000000..7c96c522af --- /dev/null +++ b/package/buildah/buildah.mk @@ -0,0 +1,46 @@ +################################################################################ +# +# buildah +# +################################################################################ + +BUILDAH_VERSION = 1.35.4 +BUILDAH_SITE = $(call github,containers,buildah,v$(BUILDAH_VERSION)) + +BUILDAH_LICENSE = Apache-2.0 +BUILDAH_LICENSE_FILES = LICENSE + +BUILDAH_DEPENDENCIES = libgpgme + +BUILDAH_CPE_ID_VENDOR = buildah_project +BUILDAH_CPE_ID_PRODUCT = buildah + +BUILDAH_TAGS = \ + cgo \ + exclude_graphdriver_aufs \ + exclude_graphdriver_btrfs \ + exclude_graphdriver_devicemapper \ + exclude_graphdriver_zfs +BUILDAH_BUILD_TARGETS = cmd/buildah +BUILDAH_GOMOD = github.com/containers/buildah + +BUILDAH_LDFLAGS = \ + -X $(BUILDAH_GOMOD)/cmd/buildah.GitCommit=v$(BUILDAH_VERSION) \ + -X $(BUILDAH_GOMOD)/define.Version=v$(BUILDAH_VERSION) + +BUILDAH_INSTALL_BINS = $(notdir $(BUILDAH_BUILD_TARGETS)) + +define BUILDAH_INSTALL_CONFIG + $(INSTALL) -D -m 644 $(@D)/contrib/buildroot/policy.json \ + $(TARGET_DIR)/etc/containers/policy.json +endef + +BUILDAH_POST_INSTALL_TARGET_HOOKS += BUILDAH_INSTALL_CONFIG + +HOST_BUILDAH_BUILD_TARGETS = $(BUILDAH_BUILD_TARGETS) +HOST_BUILDAH_TAGS = $(BUILDAH_TAGS) +HOST_BUILDAH_LDFLAGS = $(BUILDAH_LDFLAGS) +HOST_BUILDAH_INSTALL_BINS = $(BUILDAH_INSTALL_BINS) + +$(eval $(golang-package)) +$(eval $(host-golang-package)) From 8a1b701c405664342bc569852c7f960a79724300 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Sun, 24 Jul 2022 16:25:36 -0700 Subject: [PATCH 90/92] package/podman: new package podman is a CLI tool for spawning and running containers according to the OCI specification. https://github.com/containers/podman Signed-off-by: Christian Stewart --- v1 -> v2: - package/podman: bump version to v4.5.0 - Add cmd/quadlet target as required by the install script. v2 -> v3: - remove duplicate CNI_PLUGINS line in Config.in - drop old unnecessary build tags: - btrfs_noversion: not needed for btrfs >= 3.16.1 - containers_image_openpgp: no longer supported - exclude_graphdriver_devicemapper: set later in the file - Added myself to DEVELOPERS list - Added conmon -> libglib2 depends statements - Dropped CATATONIT select statement - Added CGROUPFS_MOUNT dependency if not using systemd - Thanks to Joachim for the review. v3 -> v4: - bump version to v4.5.1 Signed-off-by: Christian Stewart --- DEVELOPERS | 1 + package/Config.in | 1 + package/podman/Config.in | 58 +++++++++++++++++++++ package/podman/containers-policy.json | 14 +++++ package/podman/podman.hash | 3 ++ package/podman/podman.mk | 75 +++++++++++++++++++++++++++ 6 files changed, 152 insertions(+) create mode 100644 package/podman/Config.in create mode 100644 package/podman/containers-policy.json create mode 100644 package/podman/podman.hash create mode 100644 package/podman/podman.mk diff --git a/DEVELOPERS b/DEVELOPERS index a6e0c918dc..03a37ba859 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -641,6 +641,7 @@ F: package/moby-buildkit/ F: package/mosh/ F: package/nerdctl/ F: package/pkg-golang.mk +F: package/podman/ F: package/rtl8821au/ F: package/rtl8821cu/ F: package/runc/ diff --git a/package/Config.in b/package/Config.in index c210ac21e4..8d5fa21bb1 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2873,6 +2873,7 @@ menu "System tools" source "package/openvmtools/Config.in" source "package/pamtester/Config.in" source "package/petitboot/Config.in" + source "package/podman/Config.in" source "package/polkit/Config.in" source "package/powerpc-utils/Config.in" source "package/procps-ng/Config.in" diff --git a/package/podman/Config.in b/package/podman/Config.in new file mode 100644 index 0000000000..92f5d6ae3d --- /dev/null +++ b/package/podman/Config.in @@ -0,0 +1,58 @@ +config BR2_PACKAGE_PODMAN + bool "podman" + depends on !BR2_TOOLCHAIN_USES_UCLIBC # no fexecve + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_THREADS # conmon -> libglib2 + depends on BR2_USE_MMU # libgpgme, conmon -> libglib2 + depends on BR2_USE_WCHAR # conmon -> libglib2 + select BR2_PACKAGE_CGROUPFS_MOUNT if !BR2_PACKAGE_SYSTEMD # runtime + select BR2_PACKAGE_CNI_PLUGINS + select BR2_PACKAGE_CONMON + select BR2_PACKAGE_CRUN + select BR2_PACKAGE_IPTABLES + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_LIBGPGME + help + podman is a CLI tool for spawning and running containers + according to the OCI specification. + + https://github.com/containers/podman + +if BR2_PACKAGE_PODMAN + +config BR2_PACKAGE_PODMAN_DRIVER_BTRFS + bool "btrfs filesystem driver" + depends on BR2_USE_MMU # btrfs-progs + depends on BR2_TOOLCHAIN_HAS_THREADS # btrfs-progs + select BR2_PACKAGE_BTRFS_PROGS + help + Build the btrfs filesystem driver. + +config BR2_PACKAGE_PODMAN_DRIVER_DEVICEMAPPER + bool "devicemapper filesystem driver" + depends on BR2_TOOLCHAIN_HAS_THREADS # lvm2 + depends on BR2_USE_MMU # lvm2 + depends on !BR2_STATIC_LIBS # lvm2 + select BR2_PACKAGE_LVM2 + help + Build the devicemapper filesystem driver. + +config BR2_PACKAGE_PODMAN_DRIVER_VFS + bool "vfs filesystem driver" + depends on BR2_USE_WCHAR # gvfs + depends on BR2_USE_MMU # gvfs + depends on BR2_TOOLCHAIN_HAS_THREADS # gvfs + depends on !BR2_STATIC_LIBS # gvfs + select BR2_PACKAGE_GVFS + help + Build the vfs filesystem driver. + +endif + +comment "podman needs a glibc or musl toolchain w/ threads, wchar" + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS && \ + BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_TOOLCHAIN_USES_UCLIBC + depends on BR2_USE_MMU diff --git a/package/podman/containers-policy.json b/package/podman/containers-policy.json new file mode 100644 index 0000000000..4480eb82b4 --- /dev/null +++ b/package/podman/containers-policy.json @@ -0,0 +1,14 @@ +{ + "default": [ + { + "type": "insecureAcceptAnything" + } + ], + "transports": + { + "docker-daemon": + { + "": [{"type":"insecureAcceptAnything"}] + } + } +} diff --git a/package/podman/podman.hash b/package/podman/podman.hash new file mode 100644 index 0000000000..5e046e6d57 --- /dev/null +++ b/package/podman/podman.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 ee2c8b02b7fe301057f0382637b995a9c6c74e8d530692d6918e4c509ade6e39 podman-4.5.1-go2.tar.gz +sha256 62fb8a3a9621dc2388174caaabe9c2317b694bb9a1d46c98bcf5655b68f51be3 LICENSE diff --git a/package/podman/podman.mk b/package/podman/podman.mk new file mode 100644 index 0000000000..4c988aaa94 --- /dev/null +++ b/package/podman/podman.mk @@ -0,0 +1,75 @@ +################################################################################ +# +# podman +# +################################################################################ + +PODMAN_VERSION = 4.5.1 +PODMAN_SITE = $(call github,containers,podman,v$(PODMAN_VERSION)) +PODMAN_LICENSE = Apache-2.0 +PODMAN_LICENSE_FILES = LICENSE + +PODMAN_CPE_ID_VENDOR = podman_project +PODMAN_GOMOD = github.com/containers/podman/v4 + +PODMAN_BUILD_TARGETS = cmd/podman cmd/rootlessport cmd/quadlet +PODMAN_DEPENDENCIES += libglib2 libgpgme +PODMAN_LDFLAGS = \ + -X $(PODMAN_GOMOD)/libpod/define.gitCommit=$(PODMAN_VERSION) +PODMAN_TAGS = exclude_graphdriver_zfs + +ifeq ($(BR2_INIT_SYSTEMD),y) +PODMAN_TAGS += systemd +endif + +ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y) +PODMAN_DEPENDENCIES += libapparmor +PODMAN_TAGS += apparmor +endif + +ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) +PODMAN_TAGS += seccomp +PODMAN_DEPENDENCIES += libseccomp host-pkgconf +endif + +ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +PODMAN_TAGS += selinux +PODMAN_DEPENDENCIES += libselinux +endif + +ifeq ($(BR2_PACKAGE_PODMAN_DRIVER_BTRFS),y) +PODMAN_DEPENDENCIES += btrfs-progs +else +PODMAN_TAGS += exclude_graphdriver_btrfs +endif + +ifeq ($(BR2_PACKAGE_PODMAN_DRIVER_DEVICEMAPPER),y) +PODMAN_DEPENDENCIES += lvm2 +else +PODMAN_TAGS += exclude_graphdriver_devicemapper +endif + +ifeq ($(BR2_PACKAGE_PODMAN_DRIVER_VFS),y) +PODMAN_DEPENDENCIES += gvfs +else +PODMAN_TAGS += exclude_graphdriver_vfs +endif + +define PODMAN_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) PREFIX=/usr \ + install.bin + $(INSTALL) -d -m 700 $(TARGET_DIR)/etc/cni + $(INSTALL) -d -m 700 $(TARGET_DIR)/etc/cni/net.d + $(INSTALL) -D -m 644 $(@D)/cni/87-podman-bridge.conflist \ + $(TARGET_DIR)/etc/cni/net.d/87-podman-bridge.conflist + $(INSTALL) -d -m 755 $(TARGET_DIR)/etc/containers + $(INSTALL) -D -m 644 $(PODMAN_PKGDIR)/containers-policy.json \ + $(TARGET_DIR)/etc/containers/policy.json +endef + +define PODMAN_INSTALL_INIT_SYSTEMD + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) PREFIX=/usr \ + install.systemd +endef + +$(eval $(golang-package)) From 365fb41c63411b9c3385facdafbc80904be941a1 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Thu, 11 May 2023 17:59:04 -0700 Subject: [PATCH 91/92] package/crio: new package crio implements the Kubelet Container Runtime Interface (CRI) using OCI conformant runtimes like runc or podman. https://github.com/cri-o/cri-o/ Signed-off-by: Christian Stewart --- package/Config.in | 1 + package/crio/Config.in | 54 ++++++++++++++++++++++++++++ package/crio/crio.hash | 3 ++ package/crio/crio.mk | 82 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 140 insertions(+) create mode 100644 package/crio/Config.in create mode 100644 package/crio/crio.hash create mode 100644 package/crio/crio.mk diff --git a/package/Config.in b/package/Config.in index 8d5fa21bb1..2a5fbdb80f 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2819,6 +2819,7 @@ menu "System tools" source "package/coreutils/Config.in" source "package/cpulimit/Config.in" source "package/cpuload/Config.in" + source "package/crio/Config.in" source "package/criu/Config.in" source "package/crun/Config.in" source "package/daemon/Config.in" diff --git a/package/crio/Config.in b/package/crio/Config.in new file mode 100644 index 0000000000..35a38c587e --- /dev/null +++ b/package/crio/Config.in @@ -0,0 +1,54 @@ +config BR2_PACKAGE_CRIO + bool "crio" + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # iproute2, __kernel_{u,}long_t + depends on !BR2_TOOLCHAIN_USES_UCLIBC # no fexecve + depends on BR2_USE_MMU # libgpgme, iproute2, fork() + select BR2_PACKAGE_IPROUTE2 + select BR2_PACKAGE_IPTABLES + select BR2_PACKAGE_LIBGPGME + help + crio implements the Kubelet Container Runtime Interface (CRI) + using OCI conformant runtimes like runc or podman. + + https://github.com/cri-o/cri-o/ + +if BR2_PACKAGE_CRIO + +config BR2_PACKAGE_CRIO_DRIVER_BTRFS + bool "btrfs filesystem driver" + depends on BR2_USE_MMU # btrfs-progs + depends on BR2_TOOLCHAIN_HAS_THREADS # btrfs-progs + select BR2_PACKAGE_BTRFS_PROGS + help + Build the btrfs filesystem driver. + +config BR2_PACKAGE_CRIO_DRIVER_DEVICEMAPPER + bool "devicemapper filesystem driver" + depends on BR2_TOOLCHAIN_HAS_THREADS # lvm2 + depends on BR2_USE_MMU # lvm2 + depends on !BR2_STATIC_LIBS # lvm2 + select BR2_PACKAGE_LVM2 + help + Build the devicemapper filesystem driver. + +config BR2_PACKAGE_CRIO_DRIVER_OSTREE + bool "ostree storage driver" + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libostree, libgpgme, libgpg-error + depends on BR2_TOOLCHAIN_HAS_THREADS # libostree, libglib2 + depends on BR2_USE_WCHAR # libostree, libglib2 + depends on BR2_USE_MMU # libostree, e2fsprogs, libglib2, libgpgme + # doesn't build with musl due to lack of TEMP_FAILURE_RETRY() + depends on !BR2_TOOLCHAIN_USES_MUSL # libostree + select BR2_PACKAGE_LIBOSTREE + help + Build the ostree storage driver. + +endif + +comment "crio needs a glibc or musl toolchain w/ threads" + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS && \ + BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS + depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_UCLIBC diff --git a/package/crio/crio.hash b/package/crio/crio.hash new file mode 100644 index 0000000000..2cad8f8bb8 --- /dev/null +++ b/package/crio/crio.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 8fd7c84ff74eff0a65e090bb9619f36508e461f6925f92a5b8886b759f2347d9 crio-1.27.0.tar.gz +sha256 b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1 LICENSE diff --git a/package/crio/crio.mk b/package/crio/crio.mk new file mode 100644 index 0000000000..042c369799 --- /dev/null +++ b/package/crio/crio.mk @@ -0,0 +1,82 @@ +################################################################################ +# +# crio +# +################################################################################ + +CRIO_VERSION = 1.27.0 +CRIO_SITE = $(call github,cri-o,cri-o,v$(CRIO_VERSION)) +CRIO_LICENSE = Apache-2.0 +CRIO_LICENSE_FILES = LICENSE + +CRIO_CPE_ID_VENDOR = kubernetes +CRIO_CPE_ID_PRODUCT = cri-o + +CRIO_BUILD_TARGETS = cmd/crio cmd/crio-status +CRIO_DEPENDENCIES += libgpgme +CRIO_LDFLAGS = \ + -X $(CRIO_GOMOD)/internal/version.Version=$(CRIO_VERSION) +CRIO_TAGS = exclude_graphdriver_zfs + +ifeq ($(BR2_INIT_SYSTEMD),y) +CRIO_TAGS += systemd +endif + +ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y) +CRIO_DEPENDENCIES += libapparmor +CRIO_TAGS += apparmor +endif + +ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) +CRIO_TAGS += seccomp +CRIO_DEPENDENCIES += libseccomp host-pkgconf +endif + +ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +CRIO_TAGS += selinux +CRIO_DEPENDENCIES += libselinux +endif + +ifeq ($(BR2_PACKAGE_CRIO_DRIVER_BTRFS),y) +CRIO_DEPENDENCIES += btrfs-progs +else +CRIO_TAGS += exclude_graphdriver_btrfs +endif + +ifeq ($(BR2_PACKAGE_CRIO_DRIVER_DEVICEMAPPER),y) +CRIO_DEPENDENCIES += lvm2 +else +CRIO_TAGS += exclude_graphdriver_devicemapper +endif + +ifeq ($(BR2_PACKAGE_CRIO_DRIVER_OSTREE),y) +CRIO_DEPENDENCIES += libostree +CRIO_TAGS += ostree +endif + +define CRIO_BUILD_PINNS + $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \ + LDFLAGS="$(TARGET_LDFLAGS)" STRIP="$(TARGET_STRIP)" \ + -C $(@D)/pinns ../bin/pinns +endef +CRIO_POST_BUILD_HOOKS += CRIO_BUILD_PINNS + +define CRIO_INSTALL_TARGET_CMDS + $(HOST_GO_COMMON_ENV) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ + DESTDIR=$(TARGET_DIR) PREFIX=$(TARGET_DIR)/usr ETCDIR=$(TARGET_DIR)/etc \ + OPT_CNI_BIN_DIR=$(TARGET_DIR)/opt/cni/bin install.bin-nobuild + $(INSTALL) -d -m 700 $(TARGET_DIR)/etc/cni + $(INSTALL) -d -m 700 $(TARGET_DIR)/etc/cni/net.d + $(INSTALL) -D -m 644 $(@D)/contrib/cni/10-crio-bridge.conflist \ + $(TARGET_DIR)/etc/cni/net.d/10-crio-bridge.conflist +endef + +define CRIO_INSTALL_INIT_SYSTEMD + $(HOST_GO_COMMON_ENV) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ + DESTDIR=$(TARGET_DIR) PREFIX=$(TARGET_DIR)/usr ETCDIR=$(TARGET_DIR)/etc \ + OPT_CNI_BIN_DIR=$(TARGET_DIR)/opt/cni/bin install.systemd + $(SED) 's,/usr/local/bin,/usr/bin,g' \ + $(TARGET_DIR)/usr/lib/systemd/system/{crio,crio-wipe}.service +endef + +$(eval $(golang-package)) From 3095c20f76874ec6a3aaffc9a0c2366c67858fdf Mon Sep 17 00:00:00 2001 From: Jan Havran Date: Sun, 20 Feb 2022 15:08:11 +0100 Subject: [PATCH 92/92] package/rtklib: new package RTKLIB is an open source program package for standard and precise positioning with GNSS. Version used here is from rtkexplorer, which is better optimized and more frequently updated than original version by Tomoji Takasu. Signed-off-by: Jan Havran --- v1: WIP: For SkiffOS: - https://patchwork.ozlabs.org/project/buildroot/patch/YhJLS73VW3szIXR+@arch-zen.localdomain/ - Changes applied from Thomas's review. - There are still Changes Requested before submitting upstream. - Updated to latest revision of the pkg. - Skip building the fortran files, need to investigate when this is necessary. Tested-by: Christian Stewart --- DEVELOPERS | 1 + package/Config.in | 1 + package/rtklib/Config.in | 38 ++++++++++++++++++++++++++++++++++++++ package/rtklib/rtklib.hash | 3 +++ package/rtklib/rtklib.mk | 38 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 81 insertions(+) create mode 100644 package/rtklib/Config.in create mode 100644 package/rtklib/rtklib.hash create mode 100644 package/rtklib/rtklib.mk diff --git a/DEVELOPERS b/DEVELOPERS index 03a37ba859..39f5e7d9c4 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1558,6 +1558,7 @@ F: package/microchip-hss-payload-generator/ N: Jan Havran F: board/pine64/pinecube/ F: configs/pine64_pinecube_defconfig +F: package/rtklib/ N: Jan Heylen F: package/opentracing-cpp/ diff --git a/package/Config.in b/package/Config.in index 2a5fbdb80f..1845e5d95e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -599,6 +599,7 @@ endmenu source "package/rpi-userland/Config.in" source "package/rs485conf/Config.in" source "package/rtc-tools/Config.in" + source "package/rtklib/Config.in" source "package/rtl8188eu/Config.in" source "package/rtl8189es/Config.in" source "package/rtl8189fs/Config.in" diff --git a/package/rtklib/Config.in b/package/rtklib/Config.in new file mode 100644 index 0000000000..dc694d6b7d --- /dev/null +++ b/package/rtklib/Config.in @@ -0,0 +1,38 @@ +comment "rtklib needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS + +config BR2_PACKAGE_RTKLIB + bool "rtklib" + depends on BR2_TOOLCHAIN_HAS_THREADS + help + RTKLIB is an open source program package for standard and + precise positioning with GNSS (global navigation satellite + system). + + This is a version of RTKLIB optimized for single and dual + frequency low cost GPS receivers, especially u-blox receivers. + + https://rtkexplorer.com/ + +if BR2_PACKAGE_RTKLIB + +config BR2_PACKAGE_RTKLIB_CONVBIN + bool "convbin" + +config BR2_PACKAGE_RTKLIB_POS2KML + bool "pos2kml" + +comment "rnx2rtkp needs Fortran" + depends on !BR2_TOOLCHAIN_HAS_FORTRAN + +config BR2_PACKAGE_RTKLIB_RNX2RTKP + bool "rnx2rtkp" + depends on BR2_TOOLCHAIN_HAS_FORTRAN + +config BR2_PACKAGE_RTKLIB_RTKRCV + bool "rtkrcv" + +config BR2_PACKAGE_RTKLIB_STR2STR + bool "str2str" + +endif diff --git a/package/rtklib/rtklib.hash b/package/rtklib/rtklib.hash new file mode 100644 index 0000000000..d892fa774f --- /dev/null +++ b/package/rtklib/rtklib.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 f10efd2cc9e22d9e4a0c950ab86660747241d8b8a34d657952b5d2b9d14cb81b rtklib-620fa2873ce9182ab3ceab223170a3a2b7c3d651.tar.gz +sha256 219747832d49ee958457b2934080ab8d94bd9d8e45fcb1c36f89776fd2c5ed8a license.txt diff --git a/package/rtklib/rtklib.mk b/package/rtklib/rtklib.mk new file mode 100644 index 0000000000..ef12741df3 --- /dev/null +++ b/package/rtklib/rtklib.mk @@ -0,0 +1,38 @@ +################################################################################ +# +# rtklib +# +################################################################################ + +RTKLIB_VERSION = 620fa2873ce9182ab3ceab223170a3a2b7c3d651 +RTKLIB_SITE = $(call github,rtklibexplorer,RTKLIB,$(RTKLIB_VERSION)) +RTKLIB_LICENSE = BSD-2-Clause +RTKLIB_LICENSE_FILES = license.txt + +RTKLIB_APPS = \ + $(if $(BR2_PACKAGE_RTKLIB_CONVBIN),convbin) \ + $(if $(BR2_PACKAGE_RTKLIB_POS2KML),pos2kml) \ + $(if $(BR2_PACKAGE_RTKLIB_RNX2RTKP),rnx2rtkp) \ + $(if $(BR2_PACKAGE_RTKLIB_RTKRCV),rtkrcv) \ + $(if $(BR2_PACKAGE_RTKLIB_STR2STR),str2str) + +define RTKLIB_BUILD_CMDS + find $(@D) -name '*.a' | xargs rm -f + # TODO: Requires fortran compiler. Build conditional on RNX2RTKP. + # $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/lib/iers/gcc \ + # CC="$(TARGET_CC)" \ + # F77="$(TARGET_FC)" + $(foreach app,$(RTKLIB_APPS),\ + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/app/consapp/$(app)/gcc \ + CC="$(TARGET_CC)" + ) +endef + +define RTKLIB_INSTALL_TARGET_CMDS + $(foreach app,$(RTKLIB_APPS), \ + $(INSTALL) -m 0755 $(@D)/app/consapp/$(app)/gcc/$(app) \ + $(TARGET_DIR)/usr/bin/$(app) + ) +endef + +$(eval $(generic-package))